diff options
author | Joe Perches <joe@perches.com> | 2010-03-10 18:20:59 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:30 -0500 |
commit | 4d18ef09dfe4d1272446ad55ce5d7b06ff4b9ca8 (patch) | |
tree | 4f9c62793d0e7c7e30548b7de5d49ce2b279ca18 /drivers/block/floppy.c | |
parent | c529730a98874fa951995d8a312c7fd606832eda (diff) |
drivers/block/floppy.c: remove #define DEVICE_NAME "floppy"
Use it directly in the one place it's used.
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>
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r-- | drivers/block/floppy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 94c7abc5e291..6b75e70ca628 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -250,8 +250,6 @@ static int allowed_drive_mask = 0x33; | |||
250 | 250 | ||
251 | static int irqdma_allocated; | 251 | static int irqdma_allocated; |
252 | 252 | ||
253 | #define DEVICE_NAME "floppy" | ||
254 | |||
255 | #include <linux/blkdev.h> | 253 | #include <linux/blkdev.h> |
256 | #include <linux/blkpg.h> | 254 | #include <linux/blkpg.h> |
257 | #include <linux/cdrom.h> /* for the compatibility eject ioctl */ | 255 | #include <linux/cdrom.h> /* for the compatibility eject ioctl */ |
@@ -312,7 +310,7 @@ static int initialising = 1; | |||
312 | #define UFDCS (&fdc_state[FDC(drive)]) | 310 | #define UFDCS (&fdc_state[FDC(drive)]) |
313 | 311 | ||
314 | #define DPRINT(format, args...) \ | 312 | #define DPRINT(format, args...) \ |
315 | pr_info(DEVICE_NAME "%d: " format, current_drive, ##args) | 313 | pr_info("floppy%d: " format, current_drive, ##args) |
316 | 314 | ||
317 | #define PH_HEAD(floppy, head) (((((floppy)->stretch & 2) >> 1) ^ head) << 2) | 315 | #define PH_HEAD(floppy, head) (((((floppy)->stretch & 2) >> 1) ^ head) << 2) |
318 | #define STRETCH(floppy) ((floppy)->stretch & FD_STRETCH) | 316 | #define STRETCH(floppy) ((floppy)->stretch & FD_STRETCH) |