Skip to content

Commit

Permalink
drivers/block/floppy.c: remove #define DEVICE_NAME "floppy"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Joe Perches authored and Linus Torvalds committed Mar 12, 2010
1 parent c529730 commit 4d18ef0
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/block/floppy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 4d18ef0

Please sign in to comment.