Skip to content

Commit

Permalink
usb-storage: remove single-use define for debugging
Browse files Browse the repository at this point in the history
USB_STORAGE was defined as "usb-storage: " and used in a single location
as argument to printk. In order to be able to use the name
'USB_STORAGE', drop the definition and use the string directly for the
printk call.

Signed-off-by: Matthias Maennich <maennich@google.com>
Link: https://lore.kernel.org/r/20190813121733.52480-10-maennich@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Matthias Maennich authored and Greg Kroah-Hartman committed Aug 13, 2019
1 parent 51fa228 commit 115f3ba
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions drivers/usb/storage/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@

#include <linux/kernel.h>

#define USB_STORAGE "usb-storage: "

#ifdef CONFIG_USB_STORAGE_DEBUG
void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb);
void usb_stor_show_sense(const struct us_data *us, unsigned char key,
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/storage/scsiglue.c
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ static int queuecommand_lck(struct scsi_cmnd *srb,

/* check for state-transition errors */
if (us->srb != NULL) {
printk(KERN_ERR USB_STORAGE "Error in %s: us->srb = %p\n",
printk(KERN_ERR "usb-storage: Error in %s: us->srb = %p\n",
__func__, us->srb);
return SCSI_MLQUEUE_HOST_BUSY;
}
Expand Down

0 comments on commit 115f3ba

Please sign in to comment.