evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scsi: Implement ch_printk()

Browse source 
Update the ch driver to use dev_printk() variants instead of
plain printk(); this will prefix logging messages with the
appropriate device.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Hannes Reinecke 2014-06-25 16:39:56 +02:00 • committed by Christoph Hellwig
parent 95e159d6dd
commit 28c31729c8
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/scsi/ch.c
View file

@ -84,15 +84,19 @@ static const char * vendor_labels[CH_TYPES-4] = {
}; };
// module_param_string_array(vendor_labels, NULL, 0444); // module_param_string_array(vendor_labels, NULL, 0444);
#define ch_printk(prefix, ch, fmt, a...) \
sdev_printk(prefix, (ch)->device, "[%s] " fmt, \
(ch)->name, ##a)
#define DPRINTK(fmt, arg...) \ #define DPRINTK(fmt, arg...) \
do { \ do { \
if (debug) \ if (debug) \
printk(KERN_DEBUG "%s: " fmt, ch->name, ##arg); \ ch_printk(KERN_DEBUG, ch, fmt, ##arg); \
} while (0) } while (0)
#define VPRINTK(level, fmt, arg...) \ #define VPRINTK(level, fmt, arg...) \
do { \ do { \
if (verbose) \ if (verbose) \
printk(level "%s: " fmt, ch->name, ##arg); \ ch_printk(level, ch, fmt, ##arg); \
} while (0) } while (0)
/* ------------------------------------------------------------------- */ /* ------------------------------------------------------------------- */
@ -196,7 +200,7 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
__scsi_print_command(cmd); __scsi_print_command(cmd);
} }
result = scsi_execute_req(ch->device, cmd, direction, buffer, result = scsi_execute_req(ch->device, cmd, direction, buffer,
buflength, &sshdr, timeout * HZ, buflength, &sshdr, timeout * HZ,
MAX_RETRIES, NULL); MAX_RETRIES, NULL);
@ -924,8 +928,8 @@ static int ch_probe(struct device *dev)
MKDEV(SCSI_CHANGER_MAJOR, ch->minor), ch, MKDEV(SCSI_CHANGER_MAJOR, ch->minor), ch,
"s%s", ch->name); "s%s", ch->name);
if (IS_ERR(class_dev)) { if (IS_ERR(class_dev)) {
printk(KERN_WARNING "ch%d: device_create failed\n", sdev_printk(KERN_WARNING, sd, "ch%d: device_create failed\n",
ch->minor); ch->minor);
ret = PTR_ERR(class_dev); ret = PTR_ERR(class_dev);
goto remove_idr; goto remove_idr;
} }