Commit fa63c0ab authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds

pktcdvd: add struct pktcdvd_device.name to pr_err logging where possible

Add a new pkt_err macro to prefix the name to the logging output.  Convert
pr_err where there is a non-null struct pktcdvd_device.

Includes improvements from Andy Shevchenko.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 844aa797
...@@ -71,6 +71,9 @@ ...@@ -71,6 +71,9 @@
#define DRIVER_NAME "pktcdvd" #define DRIVER_NAME "pktcdvd"
#define pkt_err(pd, fmt, ...) \
pr_err("%s: " fmt, pd->name, ##__VA_ARGS__)
#define pkt_dbg(level, pd, fmt, ...) \ #define pkt_dbg(level, pd, fmt, ...) \
do { \ do { \
if (level == 2 && PACKET_DEBUG >= 2) \ if (level == 2 && PACKET_DEBUG >= 2) \
...@@ -938,7 +941,7 @@ static int pkt_set_segment_merging(struct pktcdvd_device *pd, struct request_que ...@@ -938,7 +941,7 @@ static int pkt_set_segment_merging(struct pktcdvd_device *pd, struct request_que
set_bit(PACKET_MERGE_SEGS, &pd->flags); set_bit(PACKET_MERGE_SEGS, &pd->flags);
return 0; return 0;
} else { } else {
pr_err("cdrom max_phys_segments too small\n"); pkt_err(pd, "cdrom max_phys_segments too small\n");
return -EIO; return -EIO;
} }
} }
...@@ -1743,7 +1746,7 @@ static noinline_for_stack int pkt_set_write_settings(struct pktcdvd_device *pd) ...@@ -1743,7 +1746,7 @@ static noinline_for_stack int pkt_set_write_settings(struct pktcdvd_device *pd)
/* /*
* paranoia * paranoia
*/ */
pr_err("write mode wrong %d\n", wp->data_block_type); pkt_err(pd, "write mode wrong %d\n", wp->data_block_type);
return 1; return 1;
} }
wp->packet_size = cpu_to_be32(pd->settings.size >> 2); wp->packet_size = cpu_to_be32(pd->settings.size >> 2);
...@@ -1787,7 +1790,7 @@ static int pkt_writable_track(struct pktcdvd_device *pd, track_information *ti) ...@@ -1787,7 +1790,7 @@ static int pkt_writable_track(struct pktcdvd_device *pd, track_information *ti)
if (ti->rt == 1 && ti->blank == 0) if (ti->rt == 1 && ti->blank == 0)
return 1; return 1;
pr_err("bad state %d-%d-%d\n", ti->rt, ti->blank, ti->packet); pkt_err(pd, "bad state %d-%d-%d\n", ti->rt, ti->blank, ti->packet);
return 0; return 0;
} }
...@@ -1820,7 +1823,7 @@ static int pkt_writable_disc(struct pktcdvd_device *pd, disc_information *di) ...@@ -1820,7 +1823,7 @@ static int pkt_writable_disc(struct pktcdvd_device *pd, disc_information *di)
} }
if (di->disc_type != 0x20 && di->disc_type != 0) { if (di->disc_type != 0x20 && di->disc_type != 0) {
pr_err("wrong disc type (%x)\n", di->disc_type); pkt_err(pd, "wrong disc type (%x)\n", di->disc_type);
return 0; return 0;
} }
...@@ -1830,7 +1833,7 @@ static int pkt_writable_disc(struct pktcdvd_device *pd, disc_information *di) ...@@ -1830,7 +1833,7 @@ static int pkt_writable_disc(struct pktcdvd_device *pd, disc_information *di)
} }
if (di->border_status == PACKET_SESSION_RESERVED) { if (di->border_status == PACKET_SESSION_RESERVED) {
pr_err("can't write to last track (reserved)\n"); pkt_err(pd, "can't write to last track (reserved)\n");
return 0; return 0;
} }
...@@ -1855,7 +1858,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd) ...@@ -1855,7 +1858,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
memset(&ti, 0, sizeof(track_information)); memset(&ti, 0, sizeof(track_information));
if ((ret = pkt_get_disc_info(pd, &di))) { if ((ret = pkt_get_disc_info(pd, &di))) {
pr_err("failed get_disc\n"); pkt_err(pd, "failed get_disc\n");
return ret; return ret;
} }
...@@ -1866,12 +1869,12 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd) ...@@ -1866,12 +1869,12 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
track = 1; /* (di.last_track_msb << 8) | di.last_track_lsb; */ track = 1; /* (di.last_track_msb << 8) | di.last_track_lsb; */
if ((ret = pkt_get_track_info(pd, track, 1, &ti))) { if ((ret = pkt_get_track_info(pd, track, 1, &ti))) {
pr_err("failed get_track\n"); pkt_err(pd, "failed get_track\n");
return ret; return ret;
} }
if (!pkt_writable_track(pd, &ti)) { if (!pkt_writable_track(pd, &ti)) {
pr_err("can't write to this track\n"); pkt_err(pd, "can't write to this track\n");
return -EROFS; return -EROFS;
} }
...@@ -1885,7 +1888,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd) ...@@ -1885,7 +1888,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
return -ENXIO; return -ENXIO;
} }
if (pd->settings.size > PACKET_MAX_SECTORS) { if (pd->settings.size > PACKET_MAX_SECTORS) {
pr_err("packet size is too big\n"); pkt_err(pd, "packet size is too big\n");
return -EROFS; return -EROFS;
} }
pd->settings.fp = ti.fp; pd->settings.fp = ti.fp;
...@@ -1927,7 +1930,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd) ...@@ -1927,7 +1930,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
pd->settings.block_mode = PACKET_BLOCK_MODE2; pd->settings.block_mode = PACKET_BLOCK_MODE2;
break; break;
default: default:
pr_err("unknown data mode\n"); pkt_err(pd, "unknown data mode\n");
return -EROFS; return -EROFS;
} }
return 0; return 0;
...@@ -1961,7 +1964,7 @@ static noinline_for_stack int pkt_write_caching(struct pktcdvd_device *pd, ...@@ -1961,7 +1964,7 @@ static noinline_for_stack int pkt_write_caching(struct pktcdvd_device *pd,
cgc.buflen = cgc.cmd[8] = 2 + ((buf[0] << 8) | (buf[1] & 0xff)); cgc.buflen = cgc.cmd[8] = 2 + ((buf[0] << 8) | (buf[1] & 0xff));
ret = pkt_mode_select(pd, &cgc); ret = pkt_mode_select(pd, &cgc);
if (ret) { if (ret) {
pr_err("write caching control failed\n"); pkt_err(pd, "write caching control failed\n");
pkt_dump_sense(&cgc); pkt_dump_sense(&cgc);
} else if (!ret && set) } else if (!ret && set)
pr_notice("enabled write caching on %s\n", pd->name); pr_notice("enabled write caching on %s\n", pd->name);
...@@ -2200,7 +2203,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write) ...@@ -2200,7 +2203,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write)
goto out; goto out;
if ((ret = pkt_get_last_written(pd, &lba))) { if ((ret = pkt_get_last_written(pd, &lba))) {
pr_err("pkt_get_last_written failed\n"); pkt_err(pd, "pkt_get_last_written failed\n");
goto out_putdev; goto out_putdev;
} }
...@@ -2230,7 +2233,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write) ...@@ -2230,7 +2233,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write)
if (write) { if (write) {
if (!pkt_grow_pktlist(pd, CONFIG_CDROM_PKTCDVD_BUFFERS)) { if (!pkt_grow_pktlist(pd, CONFIG_CDROM_PKTCDVD_BUFFERS)) {
pr_err("not enough memory for buffers\n"); pkt_err(pd, "not enough memory for buffers\n");
ret = -ENOMEM; ret = -ENOMEM;
goto out_putdev; goto out_putdev;
} }
...@@ -2352,8 +2355,8 @@ static void pkt_make_request(struct request_queue *q, struct bio *bio) ...@@ -2352,8 +2355,8 @@ static void pkt_make_request(struct request_queue *q, struct bio *bio)
pd = q->queuedata; pd = q->queuedata;
if (!pd) { if (!pd) {
pr_err("%s incorrect request queue\n", pkt_err(pd, "%s incorrect request queue\n",
bdevname(bio->bi_bdev, b)); bdevname(bio->bi_bdev, b));
goto end_io; goto end_io;
} }
...@@ -2381,7 +2384,7 @@ static void pkt_make_request(struct request_queue *q, struct bio *bio) ...@@ -2381,7 +2384,7 @@ static void pkt_make_request(struct request_queue *q, struct bio *bio)
} }
if (!bio->bi_size || (bio->bi_size % CD_FRAMESIZE)) { if (!bio->bi_size || (bio->bi_size % CD_FRAMESIZE)) {
pr_err("wrong bio size\n"); pkt_err(pd, "wrong bio size\n");
goto end_io; goto end_io;
} }
...@@ -2602,7 +2605,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) ...@@ -2602,7 +2605,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
struct block_device *bdev; struct block_device *bdev;
if (pd->pkt_dev == dev) { if (pd->pkt_dev == dev) {
pr_err("recursive setup not allowed\n"); pkt_err(pd, "recursive setup not allowed\n");
return -EBUSY; return -EBUSY;
} }
for (i = 0; i < MAX_WRITERS; i++) { for (i = 0; i < MAX_WRITERS; i++) {
...@@ -2610,11 +2613,12 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) ...@@ -2610,11 +2613,12 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
if (!pd2) if (!pd2)
continue; continue;
if (pd2->bdev->bd_dev == dev) { if (pd2->bdev->bd_dev == dev) {
pr_err("%s already setup\n", bdevname(pd2->bdev, b)); pkt_err(pd, "%s already setup\n",
bdevname(pd2->bdev, b));
return -EBUSY; return -EBUSY;
} }
if (pd2->pkt_dev == dev) { if (pd2->pkt_dev == dev) {
pr_err("can't chain pktcdvd devices\n"); pkt_err(pd, "can't chain pktcdvd devices\n");
return -EBUSY; return -EBUSY;
} }
} }
...@@ -2637,7 +2641,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) ...@@ -2637,7 +2641,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
atomic_set(&pd->cdrw.pending_bios, 0); atomic_set(&pd->cdrw.pending_bios, 0);
pd->cdrw.thread = kthread_run(kcdrwd, pd, "%s", pd->name); pd->cdrw.thread = kthread_run(kcdrwd, pd, "%s", pd->name);
if (IS_ERR(pd->cdrw.thread)) { if (IS_ERR(pd->cdrw.thread)) {
pr_err("can't start kernel thread\n"); pkt_err(pd, "can't start kernel thread\n");
ret = -ENOMEM; ret = -ENOMEM;
goto out_mem; goto out_mem;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment