Re: [PATCH 19/21] ide-floppy: fix most of the remaining checkpatch.pl issues
On Friday 11 January 2008, Borislav Petkov wrote:
i.e.,
ERROR: switch and case should be at the same indent
ERROR: need spaces around that '=' (ctx:VxV)
ERROR: trailing statements should be on next line
WARNING: no space between function name and open parenthesis '('
WARNING: printk() should include KERN_ facility level
ERROR: That open brace { should be on the previous line
ERROR: use tabs not spaces
ERROR: do not use assignment in if condition
WARNING: braces {} are not necessary for single statement blocks
ERROR: need space after that ',' (ctx:VxV)
WARNING: line over 80 characters
ERROR: do not use assignment in if condition
...
This should be the very last patch in the series
(and combined with patch #11).
Signed-off-by: Borislav Petkov [EMAIL PROTECTED]
---
drivers/ide/ide-floppy.c | 147 +++--
1 files changed, 75 insertions(+), 72 deletions(-)
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 0729df5..3d9b1e5 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -47,13 +47,13 @@
#define IDEFLOPPY_DEBUG_INFO 0
#define IDEFLOPPY_DEBUG_BUGS 1
-#define IDEFLOPPY_DEBUG( fmt, args... )
+#define IDEFLOPPY_DEBUG(fmt, args...)
#if IDEFLOPPY_DEBUG_LOG
#define debug_log(fmt, args...) \
printk(KERN_INFO ide-floppy: fmt, ## args)
#else
-#define debug_log(fmt, args... ) do {} while(0)
+#define debug_log(fmt, args...) do {} while (0)
#endif
Hmmm, these could have been dealt with in patch #4...
[...]
@@ -1314,34 +1314,34 @@ static int idefloppy_identify_device (ide_drive_t
*drive,struct hd_driveid *id)
#if IDEFLOPPY_DEBUG_INFO
printk(KERN_INFO Dumping ATAPI Identify Device floppy parameters\n);
switch (gcw.protocol) {
- case 0: case 1: sprintf(buffer, ATA);break;
- case 2: sprintf(buffer, ATAPI);break;
- case 3: sprintf(buffer, Reserved (Unknown to
ide-floppy));break;
+ case 0: case 1: sprintf(buffer, ATA); break;
+ case 2: sprintf(buffer, ATAPI); break;
+ case 3: sprintf(buffer, Reserved (Unknown to ide-floppy)); break;
}
printk(KERN_INFO Protocol Type: %s\n, buffer);
switch (gcw.device_type) {
- case 0: sprintf(buffer, Direct-access Device);break;
- case 1: sprintf(buffer, Streaming Tape Device);break;
- case 2: case 3: case 4: sprintf (buffer, Reserved);break;
- case 5: sprintf(buffer, CD-ROM Device);break;
- case 6: sprintf(buffer, Reserved);
- case 7: sprintf(buffer, Optical memory Device);break;
- case 0x1f: sprintf(buffer, Unknown or no Device type);break;
- default: sprintf(buffer, Reserved);
+ case 0: sprintf(buffer, Direct-access Device); break;
+ case 1: sprintf(buffer, Streaming Tape Device); break;
+ case 2: case 3: case 4: sprintf(buffer, Reserved); break;
+ case 5: sprintf(buffer, CD-ROM Device); break;
+ case 6: sprintf(buffer, Reserved);
+ case 7: sprintf(buffer, Optical memory Device); break;
+ case 0x1f: sprintf(buffer, Unknown or no Device type); break;
+ default: sprintf(buffer, Reserved);
}
printk(KERN_INFO Device Type: %x - %s\n, gcw.device_type, buffer);
printk(KERN_INFO Removable: %s\n, gcw.removable ? Yes:No);
switch (gcw.drq_type) {
- case 0: sprintf(buffer, Microprocessor DRQ);break;
- case 1: sprintf(buffer, Interrupt DRQ);break;
- case 2: sprintf(buffer, Accelerated DRQ);break;
- case 3: sprintf(buffer, Reserved);break;
+ case 0: sprintf(buffer, Microprocessor DRQ); break;
+ case 1: sprintf(buffer, Interrupt DRQ); break;
+ case 2: sprintf(buffer, Accelerated DRQ); break;
+ case 3: sprintf(buffer, Reserved); break;
}
printk(KERN_INFO Command Packet DRQ Type: %s\n, buffer);
switch (gcw.packet_size) {
- case 0: sprintf(buffer, 12 bytes);break;
- case 1: sprintf(buffer, 16 bytes);break;
- default: sprintf(buffer, Reserved);break;
+ case 0: sprintf(buffer, 12 bytes); break;
+ case 1: sprintf(buffer, 16 bytes); break;
+ default: sprintf(buffer, Reserved); break;
}
printk(KERN_INFO Command Packet Size: %s\n, buffer);
#endif /* IDEFLOPPY_DEBUG_INFO */
@@ -1349,13 +1349,16 @@ static int idefloppy_identify_device (ide_drive_t
*drive,struct hd_driveid *id)
if (gcw.protocol != 2)
printk(KERN_ERR ide-floppy: Protocol is not ATAPI\n);
else if (gcw.device_type != 0)
- printk(KERN_ERR ide-floppy: Device type is not set to
floppy\n);
+ printk(KERN_ERR ide-floppy: Device type is not set to
+ floppy\n);
else if (!gcw.removable)
printk(KERN_ERR ide-floppy: The removable flag is not set\n);
else if (gcw.drq_type
[PATCH 19/21] ide-floppy: fix most of the remaining checkpatch.pl issues
i.e.,
ERROR: switch and case should be at the same indent
ERROR: need spaces around that '=' (ctx:VxV)
ERROR: trailing statements should be on next line
WARNING: no space between function name and open parenthesis '('
WARNING: printk() should include KERN_ facility level
ERROR: That open brace { should be on the previous line
ERROR: use tabs not spaces
ERROR: do not use assignment in if condition
WARNING: braces {} are not necessary for single statement blocks
ERROR: need space after that ',' (ctx:VxV)
WARNING: line over 80 characters
ERROR: do not use assignment in if condition
...
Signed-off-by: Borislav Petkov [EMAIL PROTECTED]
---
drivers/ide/ide-floppy.c | 147 +++--
1 files changed, 75 insertions(+), 72 deletions(-)
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 0729df5..3d9b1e5 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -47,13 +47,13 @@
#define IDEFLOPPY_DEBUG_INFO 0
#define IDEFLOPPY_DEBUG_BUGS 1
-#define IDEFLOPPY_DEBUG( fmt, args... )
+#define IDEFLOPPY_DEBUG(fmt, args...)
#if IDEFLOPPY_DEBUG_LOG
#define debug_log(fmt, args...) \
printk(KERN_INFO ide-floppy: fmt, ## args)
#else
-#define debug_log(fmt, args... ) do {} while(0)
+#define debug_log(fmt, args...) do {} while (0)
#endif
@@ -275,9 +275,9 @@ static int idefloppy_do_end_request(ide_drive_t *drive, int
uptodate, int nsecs)
debug_log(Reached %s\n, __FUNCTION__);
switch (uptodate) {
- case 0: error = IDEFLOPPY_ERROR_GENERAL; break;
- case 1: error = 0; break;
- default: error = uptodate;
+ case 0: error = IDEFLOPPY_ERROR_GENERAL; break;
+ case 1: error = 0; break;
+ default: error = uptodate;
}
if (error)
floppy-failed_pc = NULL;
@@ -396,7 +396,7 @@ static idefloppy_pc_t
*idefloppy_next_pc_storage(ide_drive_t *drive)
idefloppy_floppy_t *floppy = drive-driver_data;
if (floppy-pc_stack_index == IDEFLOPPY_PC_STACK)
- floppy-pc_stack_index=0;
+ floppy-pc_stack_index = 0;
return (floppy-pc_stack[floppy-pc_stack_index++]);
}
@@ -526,7 +526,8 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive)
/* Clear the interrupt */
stat = drive-hwif-INB(IDE_STATUS_REG);
- if ((stat DRQ_STAT) == 0) { /* No more interrupts */
+ if ((stat DRQ_STAT) == 0) {
+ /* No more interrupts */
debug_log(Packet command completed, %d bytes transferred\n,
pc-actually_transferred);
clear_bit(PC_DMA_IN_PROGRESS, pc-flags);
@@ -771,7 +772,8 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t
*drive,
ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK |
IDE_TFLAG_OUT_DEVICE, bcount, dma);
- if (dma) { /* Begin DMA, if necessary */
+ if (dma) {
+ /* Begin DMA, if necessary */
set_bit(PC_DMA_IN_PROGRESS, pc-flags);
hwif-dma_start(drive);
}
@@ -785,7 +787,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t
*drive,
pkt_xfer_routine = idefloppy_transfer_pc;
}
- if (test_bit (IDEFLOPPY_DRQ_INTERRUPT, floppy-flags)) {
+ if (test_bit(IDEFLOPPY_DRQ_INTERRUPT, floppy-flags)) {
/* Issue the packet command */
ide_execute_command(drive, WIN_PACKETCMD,
pkt_xfer_routine,
@@ -842,7 +844,7 @@ static void idefloppy_create_format_unit_cmd(idefloppy_pc_t
*pc, int b, int l,
put_unaligned(cpu_to_be32(b), (unsigned int *)(pc-buffer[4]));
put_unaligned(cpu_to_be32(l), (unsigned int *)(pc-buffer[8]));
- pc-buffer_size=12;
+ pc-buffer_size = 12;
set_bit(PC_WRITING, pc-flags);
}
@@ -858,15 +860,15 @@ static void
idefloppy_create_mode_sense_cmd(idefloppy_pc_t *pc, u8 page_code,
pc-c[2] = page_code + (type 6);
switch (page_code) {
- case IDEFLOPPY_CAPABILITIES_PAGE:
- length += 12;
- break;
- case IDEFLOPPY_FLEXIBLE_DISK_PAGE:
- length += 32;
- break;
- default:
- printk(KERN_ERR ide-floppy: unsupported page code
- in create_mode_sense_cmd\n);
+ case IDEFLOPPY_CAPABILITIES_PAGE:
+ length += 12;
+ break;
+ case IDEFLOPPY_FLEXIBLE_DISK_PAGE:
+ length += 32;
+ break;
+ default:
+ printk(KERN_ERR ide-floppy: unsupported page code in %s\n,
+ __FUNCTION__);
}
put_unaligned(cpu_to_be16(length), (u16 *) pc-c[7]);
pc-request_transfer = length;
@@ -893,7 +895,7 @@ static void
