mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: Stephen Hemminger <shemminger@vyatta.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Marcin Slusarz <marcin.slusarz@gmail.com>
Subject: [PATCH 09/13] drivers/block/floppy.c: remove #define DEVICE_NAME "floppy"
Date: Tue,  1 Dec 2009 22:07:49 -0800	[thread overview]
Message-ID: <2249f646682f34ebf63b08c77ff45f366fd1cf47.1259733457.git.joe@perches.com> (raw)
In-Reply-To: <cover.1259733456.git.joe@perches.com>

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 96b1b21..cc76f3d 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


  parent reply	other threads:[~2009-12-02  6:09 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-02  6:07 [PATCH 00/13] drivers/block/floppy.c: More cleanups Joe Perches
2009-12-02  6:07 ` [PATCH 01/13] drivers/block/floppy.c: Remove macro LOCK_FDC Joe Perches
2009-12-02  6:07 ` [PATCH 02/13] drivers/block/floppy.c: Add debug_dcl(...) macro Joe Perches
2009-12-02  6:07 ` [PATCH 03/13] drivers/block/floppy.c: Remove [U]CLEARF, [U]SETF, and [U]TESTF macros Joe Perches
2009-12-02  6:07 ` [PATCH 04/13] drivers/block/floppy.c: Remove most uses of CALL and ECALL macros Joe Perches
2009-12-02  6:07 ` [PATCH 05/13] drivers/block/floppy.c: remove [_]COPYIN [_]COPYOUT " Joe Perches
2009-12-02  6:07 ` [PATCH 06/13] drivers/block/floppy.c: remove macros CALL, WAIT and IWAIT Joe Perches
2009-12-02  6:07 ` [PATCH 07/13] drivers/block/floppy.c: convert int 1/0 to bool true/false Joe Perches
2009-12-02  6:07 ` [PATCH 08/13] drivers/block/floppy.c: Move leading && and || to preceding line Joe Perches
2009-12-02  6:07 ` Joe Perches [this message]
2009-12-02  6:07 ` [PATCH 10/13] drivers/block/floppy.c: Convert int initialising to bool initialized Joe Perches
2009-12-02  6:07 ` [PATCH 11/13] drivers/block/floppy.c: Add function is_ready_state Joe Perches
2009-12-02  6:07 ` [PATCH 12/13] drivers/block/floppy.c: Readd SunOS eject cmd comment Joe Perches
2009-12-02  6:07 ` [PATCH 13/13] drivers/block/floppy.c: Remove unnecessary return and braces Joe Perches
2009-12-02 17:05 ` [PATCH 00/13] drivers/block/floppy.c: More cleanups Marcin Slusarz
2009-12-02 19:03 ` Stephen Hemminger
2009-12-02 20:05   ` Joe Perches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2249f646682f34ebf63b08c77ff45f366fd1cf47.1259733457.git.joe@perches.com \
    --to=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marcin.slusarz@gmail.com \
    --cc=shemminger@vyatta.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®