Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d18ef09 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

drivers/block/floppy.c: remove #define DEVICE_NAME "floppy" 



Use it directly in the one place it's used.

Signed-off-by: default avatarJoe 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c529730a

drivers/block/floppy.c

+1 −3
Original line number Diff line number Diff line
@@ -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)