scsi: cxlflash: Update debug prints in reset handlers

BugLink: http://bugs.launchpad.net/bugs/1702521
The device and host reset handler contain debug prints to help identify
the entities being reset. Today these reset handlers are based on a SCSI
EH design that uses a SCSI command reference as a means of identifying
the target entity. As such, the debug trace includes the SCSI command
pointer and associated CDB. This is not necessary as the SCSI command is
simply the messenger in these scenarios.

Refactor the debug prints in the host and reset handlers to only present
information that is applicable given the function scope.

Signed-off-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 5a4d9d7790422c4a92d8ca52e37c1e2b45d42c27)
Signed-off-by: Victor Aoqui <victora@linux.vnet.ibm.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index 7054e11f732a7ed0798c644590f2a1294cdfea05..077f62e208aaef5125756ecd30273176698a7bc7 100644 (file)
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -2435,14 +2435,8 @@ static int cxlflash_eh_device_reset_handler(struct scsi_cmnd *scp)
        struct device *dev = &cfg->dev->dev;
        int rcr = 0;
 
-       dev_dbg(dev, "%s: (scp=%p) %d/%d/%d/%llu "
-               "cdb=(%08x-%08x-%08x-%08x)\n", __func__, scp, host->host_no,
-               sdev->channel, sdev->id, sdev->lun,
-               get_unaligned_be32(&((u32 *)scp->cmnd)[0]),
-               get_unaligned_be32(&((u32 *)scp->cmnd)[1]),
-               get_unaligned_be32(&((u32 *)scp->cmnd)[2]),
-               get_unaligned_be32(&((u32 *)scp->cmnd)[3]));
-
+       dev_dbg(dev, "%s: %d/%d/%d/%llu\n", __func__,
+               host->host_no, sdev->channel, sdev->id, sdev->lun);
 retry:
        switch (cfg->state) {
        case STATE_NORMAL:
@@ -2483,13 +2477,7 @@ static int cxlflash_eh_host_reset_handler(struct scsi_cmnd *scp)
        struct cxlflash_cfg *cfg = shost_priv(host);
        struct device *dev = &cfg->dev->dev;
 
-       dev_dbg(dev, "%s: (scp=%p) %d/%d/%d/%llu "
-               "cdb=(%08x-%08x-%08x-%08x)\n", __func__, scp, host->host_no,
-               scp->device->channel, scp->device->id, scp->device->lun,
-               get_unaligned_be32(&((u32 *)scp->cmnd)[0]),
-               get_unaligned_be32(&((u32 *)scp->cmnd)[1]),
-               get_unaligned_be32(&((u32 *)scp->cmnd)[2]),
-               get_unaligned_be32(&((u32 *)scp->cmnd)[3]));
+       dev_dbg(dev, "%s: %d\n", __func__, host->host_no);
 
        switch (cfg->state) {
        case STATE_NORMAL: