Re: [PATCH v2] usb-storage: SCSI glue: use pr_fmt and pr_err

Alan Stern
2019-09-18T18:39:54Z

On Wed, 18 Sep 2019, Matthias Maennich wrote:

> Follow common practice and retire printk(KERN_ERR ...) in favor of
> pr_fmt and dev_err().
>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: usb-storage@lists.one-eyed-alien.net
> Signed-off-by: Matthias Maennich <maennich@google.com>
> ---
> drivers/usb/storage/scsiglue.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
> index 6737fab94959..afc4e3221369 100644
> --- a/drivers/usb/storage/scsiglue.c
> +++ b/drivers/usb/storage/scsiglue.c
> @@ -28,6 +28,8 @@
> * status of a command.
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +

What's this here for?

Alan Stern

> #include <linux/blkdev.h>
> #include <linux/dma-mapping.h>
> #include <linux/module.h>
> @@ -379,8 +381,8 @@ 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",
> - __func__, us->srb);
> + dev_err(&us->pusb_intf->dev,
> + "Error in %s: us->srb = %p\n", __func__, us->srb);
> return SCSI_MLQUEUE_HOST_BUSY;
> }
>
>