From: Joe Perches <joe@perches.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 7/8] pktcdvd: Convert pr_info to pkt_info
Date: Fri, 31 May 2013 21:11:28 -0700 [thread overview]
Message-ID: <73553be7ec239a510306ea1d0ecc35ab38b90fa2.1370048648.git.joe@perches.com> (raw)
In-Reply-To: <cover.1370048648.git.joe@perches.com>
Add a new pkt_info macro to prefix the name to the logging output.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/block/pktcdvd.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 3815f01..995d688 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -75,6 +75,8 @@
pr_err("%s: " fmt, pd->name, ##__VA_ARGS__)
#define pkt_notice(pd, fmt, ...) \
pr_notice("%s: " fmt, pd->name, ##__VA_ARGS__)
+#define pkt_info(pd, fmt, ...) \
+ pr_info("%s: " fmt, pd->name, ##__VA_ARGS__)
#define pkt_dbg(level, pd, fmt, ...) \
do { \
@@ -1564,10 +1566,10 @@ work_to_do:
static void pkt_print_settings(struct pktcdvd_device *pd)
{
- pr_info("%s packets, %u blocks, Mode-%c disc\n",
- pd->settings.fp ? "Fixed" : "Variable",
- pd->settings.size >> 2,
- pd->settings.block_mode == 8 ? '1' : '2');
+ pkt_info(pd, "%s packets, %u blocks, Mode-%c disc\n",
+ pd->settings.fp ? "Fixed" : "Variable",
+ pd->settings.size >> 2,
+ pd->settings.block_mode == 8 ? '1' : '2');
}
static int pkt_mode_sense(struct pktcdvd_device *pd, struct packet_command *cgc, int page_code, int page_control)
@@ -2115,7 +2117,7 @@ static noinline_for_stack int pkt_media_speed(struct pktcdvd_device *pd,
return 1;
}
if (*speed) {
- pr_info("maximum media speed: %d\n", *speed);
+ pkt_info(pd, "maximum media speed: %d\n", *speed);
return 0;
} else {
pkt_notice(pd, "unknown speed %d for sub-type %d\n", sp, st);
@@ -2242,7 +2244,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write)
ret = -ENOMEM;
goto out_putdev;
}
- pr_info("%lukB available on disc\n", lba << 1);
+ pkt_info(pd, "%lukB available on disc\n", lba << 1);
}
return 0;
--
1.8.1.2.459.gbcd45b4.dirty
next prev parent reply other threads:[~2013-06-01 4:13 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-16 8:11 [patch] pktcdvd: silence static checker warning Dan Carpenter
2013-05-29 13:37 ` Jiri Kosina
2013-05-30 20:57 ` [PATCH 0/3] pktcdvd: A few more neatenings Joe Perches
2013-05-30 20:57 ` [PATCH 1/3] pktcdvd: Convert ZONE macro to static function get_zone() Joe Perches
2013-05-30 20:57 ` [PATCH 2/3] pktcdvd: Convert printk to pr_<level> Joe Perches
2013-05-31 19:44 ` Andy Shevchenko
2013-05-31 21:56 ` Joe Perches
2013-05-30 20:57 ` [PATCH 3/3] pktcdvd: Consolidate DPRINTK and VPRINTK macros Joe Perches
2013-05-31 5:37 ` [PATCH 0/3] pktcdvd: A few more neatenings Joe Perches
2013-06-01 4:11 ` [PATCH V2 0/8] pktcdvd: More neatenings Joe Perches
2013-06-01 4:11 ` [PATCH V2 1/8] pktcdvd: Convert ZONE macro to static function get_zone() Joe Perches
2013-06-01 4:11 ` [PATCH V2 2/8] pktcdvd: Convert printk to pr_<level> Joe Perches
2013-06-03 9:57 ` Dan Carpenter
2013-06-03 10:42 ` Andy Shevchenko
2013-06-03 11:59 ` Joe Perches
2013-06-03 12:50 ` Dan Carpenter
2013-06-03 12:58 ` Joe Perches
2013-06-03 16:45 ` [PATCH V3 0/8] pktcdvd: More neatenings Joe Perches
2013-06-03 16:45 ` [PATCH V3 1/8] pktcdvd: Convert ZONE macro to static function get_zone() Joe Perches
2013-06-03 16:45 ` [PATCH V3 2/8] pktcdvd: Convert printk to pr_<level> Joe Perches
2013-06-03 16:45 ` [PATCH V3 3/8] pktcdvd: Consolidate DPRINTK and VPRINTK macros Joe Perches
2013-06-03 16:45 ` [PATCH V3 4/8] pktcdvd: Add struct pktcdvd_device * to pkt_dbg Joe Perches
2013-06-03 16:45 ` [PATCH V3 5/8] pktcdvd: Add struct pktcdvd_device.name to pr_err logging where possible Joe Perches
2013-06-03 16:45 ` [PATCH V3 6/8] pktcdvd: Convert pr_notice to pkt_notice Joe Perches
2013-06-03 16:45 ` [PATCH V3 7/8] pktcdvd: Convert pr_info to pkt_info Joe Perches
2013-06-03 16:45 ` [PATCH V3 8/8] pktcdvd: Add struct pktcdvd_device * to pkt_dump_sense() Joe Perches
2013-07-23 0:53 ` [PATCH V3 0/8] pktcdvd: More neatenings Joe Perches
2013-07-30 9:18 ` Jiri Kosina
2013-06-01 4:11 ` [PATCH V2 3/8] pktcdvd: Consolidate DPRINTK and VPRINTK macros Joe Perches
2013-06-01 4:11 ` [PATCH V2 4/8] pktcdvd: Add struct pktcdvd_device * to pkt_dbg Joe Perches
2013-06-01 4:11 ` [PATCH V2 5/8] pktcdvd: Add struct pktcdvd_device.name to pr_err logging where possible Joe Perches
2013-06-01 4:11 ` [PATCH V2 6/8] pktcdvd: Convert pr_notice to pkt_notice Joe Perches
2013-06-02 12:12 ` Andy Shevchenko
2013-06-02 12:22 ` Joe Perches
2013-06-01 4:11 ` Joe Perches [this message]
2013-06-01 4:11 ` [PATCH V2 8/8] pktcdvd: Add struct pktcdvd_device * to pkt_dump_sense() 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=73553be7ec239a510306ea1d0ecc35ab38b90fa2.1370048648.git.joe@perches.com \
--to=joe@perches.com \
--cc=andy.shevchenko@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
/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®