| Message ID | 20190813121733.52480-10-maennich@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Symbol namespaces - RFC | expand |
On Tue, Aug 13, 2019 at 01:17:06PM +0100, Matthias Maennich wrote: > 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> > --- > drivers/usb/storage/debug.h | 2 -- > drivers/usb/storage/scsiglue.c | 2 +- > 2 files changed, 1 insertion(+), 3 deletions(-) I'll go take this today. The module really should just be using dev_err() there. It needs to be cleaned up :( thanks, greg k-h
On Tue, Aug 13, 2019 at 02:42:59PM +0200, Greg KH wrote: > On Tue, Aug 13, 2019 at 01:17:06PM +0100, Matthias Maennich wrote: > > 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> > > --- > > drivers/usb/storage/debug.h | 2 -- > > drivers/usb/storage/scsiglue.c | 2 +- > > 2 files changed, 1 insertion(+), 3 deletions(-) > > I'll go take this today. The module really should just be using > dev_err() there. It needs to be cleaned up :( Now applied to the usb git tree, thanks. greg k-h
diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h index 6d64f342f587..16ce06039a4d 100644 --- a/drivers/usb/storage/debug.h +++ b/drivers/usb/storage/debug.h @@ -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, diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 05b80211290d..df4de8323eff 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c @@ -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; }
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> --- drivers/usb/storage/debug.h | 2 -- drivers/usb/storage/scsiglue.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)