diff options
| author | Joe Perches <joe@perches.com> | 2010-03-10 15:20:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 15:52:30 -0800 |
| commit | 4d18ef09dfe4d1272446ad55ce5d7b06ff4b9ca8 (patch) | |
| tree | 4f9c62793d0e7c7e30548b7de5d49ce2b279ca18 | |
| parent | c529730a98874fa951995d8a312c7fd606832eda (diff) | |
| download | linux-3.10-4d18ef09dfe4d1272446ad55ce5d7b06ff4b9ca8.tar.gz linux-3.10-4d18ef09dfe4d1272446ad55ce5d7b06ff4b9ca8.tar.bz2 linux-3.10-4d18ef09dfe4d1272446ad55ce5d7b06ff4b9ca8.zip | |
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>
| -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 94c7abc5e29..6b75e70ca62 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -250,8 +250,6 @@ static int allowed_drive_mask = 0x33; static int irqdma_allocated; -#define DEVICE_NAME "floppy" - #include <linux/blkdev.h> #include <linux/blkpg.h> #include <linux/cdrom.h> /* for the compatibility eject ioctl */ @@ -312,7 +310,7 @@ static int initialising = 1; #define UFDCS (&fdc_state[FDC(drive)]) #define DPRINT(format, args...) \ - pr_info(DEVICE_NAME "%d: " format, current_drive, ##args) + pr_info("floppy%d: " format, current_drive, ##args) #define PH_HEAD(floppy, head) (((((floppy)->stretch & 2) >> 1) ^ head) << 2) #define STRETCH(floppy) ((floppy)->stretch & FD_STRETCH) |