iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers/block/floppy.c: DPRINT neatening

Browse Source 
Move DPRINT macro definition above 1st use Consolidate a format string
(>80 columns) Add a newline to an unterminated message Comment neatened

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joe Perches 2010-03-10 15:21:05 -08:00 committed by Linus Torvalds
parent 1a23d13335
commit 891eda80a5
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/block/floppy.c
View File

@ -149,8 +149,11 @@
#define REALLY_SLOW_IO #define REALLY_SLOW_IO
#define DEBUGT 2 #define DEBUGT 2
#define DCL_DEBUG /* debug disk change line */
#define DPRINT(format, args...) \
pr_info("floppy%d: " format, current_drive, ##args)
#define DCL_DEBUG /* debug disk change line */
#ifdef DCL_DEBUG #ifdef DCL_DEBUG
#define debug_dcl(test, fmt, args...) \ #define debug_dcl(test, fmt, args...) \
do { if ((test) & FD_DEBUG) DPRINT(fmt, ##args); } while (0) do { if ((test) & FD_DEBUG) DPRINT(fmt, ##args); } while (0)
@ -159,7 +162,6 @@
do { if (0) DPRINT(fmt, ##args); } while (0) do { if (0) DPRINT(fmt, ##args); } while (0)
#endif #endif
/* do print messages for unexpected interrupts */ /* do print messages for unexpected interrupts */
static int print_unex = 1; static int print_unex = 1;
#include <linux/module.h> #include <linux/module.h>
@ -308,9 +310,6 @@ static bool initialized;
#define UDRWE (&write_errors[drive]) #define UDRWE (&write_errors[drive])
#define UFDCS (&fdc_state[FDC(drive)]) #define UFDCS (&fdc_state[FDC(drive)])
#define DPRINT(format, args...) \
pr_info("floppy%d: " format, current_drive, ##args)
#define PH_HEAD(floppy, head) (((((floppy)->stretch & 2) >> 1) ^ head) << 2) #define PH_HEAD(floppy, head) (((((floppy)->stretch & 2) >> 1) ^ head) << 2)
#define STRETCH(floppy) ((floppy)->stretch & FD_STRETCH) #define STRETCH(floppy) ((floppy)->stretch & FD_STRETCH)
@ -345,7 +344,7 @@ static bool initialized;
*/ */
#define MAX_REPLIES 16 #define MAX_REPLIES 16
static unsigned char reply_buffer[MAX_REPLIES]; static unsigned char reply_buffer[MAX_REPLIES];
static int inr; /* size of reply buffer, when called from interrupt */ static int inr; /* size of reply buffer, when called from interrupt */
#define ST0 (reply_buffer[0]) #define ST0 (reply_buffer[0])
#define ST1 (reply_buffer[1]) #define ST1 (reply_buffer[1])
#define ST2 (reply_buffer[2]) #define ST2 (reply_buffer[2])
@ -755,8 +754,7 @@ static int disk_change(int drive)
if (UDRS->keep_data >= 0) { if (UDRS->keep_data >= 0) {
if ((UDP->flags & FTD_MSG) && if ((UDP->flags & FTD_MSG) &&
current_type[drive] != NULL) current_type[drive] != NULL)
DPRINT("Disk type is undefined after " DPRINT("Disk type is undefined after disk change\n");
"disk change\n");
current_type[drive] = NULL; current_type[drive] = NULL;
floppy_sizes[TOMINOR(drive)] = MAX_DISK_SIZE << 1; floppy_sizes[TOMINOR(drive)] = MAX_DISK_SIZE << 1;
} }
@ -1447,7 +1445,7 @@ static int interpret_errors(void)
char bad; char bad;
if (inr != 7) { if (inr != 7) {
DPRINT("-- FDC reply error"); DPRINT("-- FDC reply error\n");
FDCS->reset = 1; FDCS->reset = 1;
return 1; return 1;
} }