Add a new pkt_info macro to prefix the name to the logging output.
Signed-off-by: Joe Perches <j...@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 faae94c..f81648c 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 { \
@@ -1563,10 +1565,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)
@@ -2114,7 +2116,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);
@@ -2241,7 +2243,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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
