summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-09-12 01:25:57 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-12 02:59:33 +0400
commit0c075d64df3aa9636a8700a710a2f2ada5e453a2 (patch)
treeae26277fd9343b5daf77a861a2995a006d9bab56
parentca73dabc3d1df4aaacb242b6d4e39cd36618444f (diff)
downloadlinux-0c075d64df3aa9636a8700a710a2f2ada5e453a2.tar.xz
pktcdvd: convert pr_info to pkt_info
Add a new pkt_info macro to prefix the name to the logging output. Signed-off-by: Joe Perches <joe@perches.com> Cc: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/block/pktcdvd.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 136a04c3a07a..1ceafb70fc16 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 { \
@@ -1561,10 +1563,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)
@@ -2112,7 +2114,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);
@@ -2239,7 +2241,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;