LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Borislav Petkov <petkovbb@googlemail.com>
To: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org
Subject: Re: [PATCH 4/5] ide-cd: shorten lines longer than 80 columns
Date: Wed, 27 Feb 2008 23:15:32 +0100	[thread overview]
Message-ID: <20080227221532.GB9545@gollum.tnic> (raw)
In-Reply-To: <200802272218.50537.bzolnier@gmail.com>

On Wed, Feb 27, 2008 at 10:18:50PM +0100, Bartlomiej Zolnierkiewicz wrote:
> On Wednesday 27 February 2008, Borislav Petkov wrote:
> > Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
> 
> interdiff for the merged version
> 
> diff -u b/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
> --- b/drivers/ide/ide-cd.c
> +++ b/drivers/ide/ide-cd.c
> @@ -433,13 +433,13 @@
>  			 * sector. If we got here the error is not correctable.
>  			 */
>  			ide_dump_status_no_sense(drive,
> -						"media error (bad sector)",
> -						stat);
> +						 "media error (bad sector)",
> +						 stat);
>  			do_end_request = 1;
>  		} else if (sense_key == BLANK_CHECK) {
>  			/* disk appears blank ?? */
>  			ide_dump_status_no_sense(drive, "media error (blank)",
> -						stat);
> +						 stat);
>  			do_end_request = 1;
>  		} else if ((err & ~ABRT_ERR) != 0) {
>  			/* go to the default handler for other errors */
> @@ -510,7 +510,7 @@
>  	default:
>  		if (!(rq->cmd_flags & REQ_QUIET))
>  			printk(KERN_INFO "ide-cd: cmd 0x%x timed out\n",
> -				rq->cmd[0]);
> +					 rq->cmd[0]);

why do you push the rq->cmd[0] thingy back here. Shouldn't it be aligned
with the opening brace as the zillion others so far?

>  		wait = 0;
>  		break;
>  	}
> @@ -552,7 +552,7 @@
>  
>  		/* packet command */
>  		ide_execute_command(drive, WIN_PACKETCMD, handler,
> -					ATAPI_WAIT_PC, cdrom_timer_expiry);
> +				    ATAPI_WAIT_PC, cdrom_timer_expiry);
>  		return ide_started;
>  	} else {
>  		unsigned long flags;
> @@ -809,7 +809,7 @@
>  	info->dma = 0;
>  	info->start_seek = jiffies;
>  	return cdrom_start_packet_command(drive, 0,
> -					cdrom_start_seek_continuation);
> +					  cdrom_start_seek_continuation);
>  }
>  
>  /*
> @@ -819,8 +819,8 @@
>  static void restore_request(struct request *rq)
>  {
>  	if (rq->buffer != bio_data(rq->bio)) {
> -		sector_t n = (rq->buffer - (char *) bio_data(rq->bio)) /
> -				SECTOR_SIZE;
> +		sector_t n =
> +			(rq->buffer - (char *)bio_data(rq->bio)) / SECTOR_SIZE;

i must say, lines like this one always look ugly, no matter the formatting
tricks.

>  		rq->buffer = bio_data(rq->bio);
>  		rq->nr_sectors += n;
> @@ -1192,8 +1192,8 @@
>  	/* sg request */
>  	if (rq->bio) {
>  		int mask = drive->queue->dma_alignment;
> -		unsigned long addr = (unsigned long)
> -					page_address(bio_page(rq->bio));
> +		unsigned long addr =
> +			(unsigned long)page_address(bio_page(rq->bio));
>  
>  		info->dma = drive->using_dma;
>  
> @@ -1233,16 +1233,14 @@
>  					return ide_stopped;
>  				}
>  				printk(KERN_ERR "%s: DSC timeout\n",
> -					drive->name);
> +						drive->name);
>  			}
>  			info->cd_flags &= ~IDE_CD_FLAG_SEEKING;
>  		}
> -		if ((rq_data_dir(rq) == READ) &&
> -			IDE_LARGE_SEEK(info->last_block,
> -					block,
> -					IDECD_SEEK_THRESHOLD) &&
> -			drive->dsc_overlap)
> -
> +		if (rq_data_dir(rq) == READ &&
> +		    IDE_LARGE_SEEK(info->last_block, block,
> +				   IDECD_SEEK_THRESHOLD) &&
> +		    drive->dsc_overlap)
>  			action = cdrom_start_seek(drive, block);
>  		else
>  			action = cdrom_start_rw(drive, rq);
> @@ -1375,7 +1373,7 @@
>  		toc = kmalloc(sizeof(struct atapi_toc), GFP_KERNEL);
>  		if (toc == NULL) {
>  			printk(KERN_ERR "%s: No cdrom TOC buffer!\n",
> -				drive->name);
> +					drive->name);
>  			return -ENOMEM;
>  		}
>  		info->toc = toc;
> @@ -1619,7 +1617,7 @@
>  	if (drive->media == ide_optical) {
>  		cdi->mask &= ~(CDC_MO_DRIVE | CDC_RAM);
>  		printk(KERN_ERR "%s: ATAPI magneto-optical drive\n",
> -			drive->name);
> +				drive->name);
>  		return nslots;
>  	}
>  
> @@ -2118,7 +2116,7 @@
>  	if (ignore != NULL) {
>  		if (strstr(ignore, drive->name)) {
>  			printk(KERN_INFO "ide-cd: ignoring drive %s\n",
> -				drive->name);
> +					 drive->name);
>  			goto failed;
>  		}
>  	}
> @@ -2130,7 +2128,7 @@
>  	info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL);
>  	if (info == NULL) {
>  		printk(KERN_ERR "%s: Can't allocate a cdrom structure\n",
> -			drive->name);
> +				drive->name);
>  		goto failed;
>  	}
>  

-- 
Regards/Gruß,
    Boris.

  reply	other threads:[~2008-02-27 22:15 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-27 18:20 [PATCH 0/5] ide-cd: trivial fixes Borislav Petkov
2008-02-27 18:20 ` [PATCH 1/5] ide-cd: include proper headers Borislav Petkov
2008-02-27 18:20 ` [PATCH 2/5] ide-cd: put all proc-related code at one place Borislav Petkov
2008-02-27 18:20 ` [PATCH 3/5] ide-cd: fixup comments Borislav Petkov
2008-02-27 21:18   ` Bartlomiej Zolnierkiewicz
2008-02-27 18:20 ` [PATCH 4/5] ide-cd: shorten lines longer than 80 columns Borislav Petkov
2008-02-27 21:18   ` Bartlomiej Zolnierkiewicz
2008-02-27 22:15     ` Borislav Petkov [this message]
2008-02-27 23:01       ` Bartlomiej Zolnierkiewicz
2008-02-27 23:15         ` Bartlomiej Zolnierkiewicz
2008-02-28  6:16         ` Borislav Petkov
2008-02-27 18:20 ` [PATCH 5/5] ide-cd: fix remaining checkpatch.pl issues Borislav Petkov
2008-02-27 21:18   ` Bartlomiej Zolnierkiewicz
2008-02-27 21:18 ` [PATCH 0/5] ide-cd: trivial fixes Bartlomiej Zolnierkiewicz
2008-02-27 22:18   ` Borislav Petkov
2008-02-27 22:48     ` Bartlomiej Zolnierkiewicz
2008-02-28  5:52       ` Borislav Petkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080227221532.GB9545@gollum.tnic \
    --to=petkovbb@googlemail.com \
    --cc=bzolnier@gmail.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=petkovbb@gmail.com \
    --subject='Re: [PATCH 4/5] ide-cd: shorten lines longer than 80 columns' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).