lkml.org 
[lkml]   [2010]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/24] drivers/block/floppy.c: remove #define DEVICE_NAME "floppy"
    Date
    use it directly in the one place it's used

    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    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 5e3286d..7132ee4 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)
    --
    1.6.6.rc0.57.gad7a


    \
     
     \ /
      Last update: 2010-01-22 05:57    [W:0.020 / U:30.864 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site