acornscsi: use scsi_print_command()

Update acornscsi to use scsi_print_command() instead of the
underscore version and use scmd_printk() in acornscsi_done().
This will add correct device annotations in the resulting message.
And we should be using set_host_byte() for setting the
final result.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index d89b9b4deb3c..deaaf84989cd 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -850,13 +850,13 @@ static void acornscsi_done(AS_Host *host, struct scsi_cmnd **SCpntp,
                         break;
 
                     default:
-                        printk(KERN_ERR "scsi%d.H: incomplete data transfer detected: result=%08X command=",
-                                host->host->host_no, SCpnt->result);
-                        __scsi_print_command(SCpnt->cmnd);
+                        scmd_printk(KERN_ERR, SCpnt,
+                                    "incomplete data transfer detected: "
+                                    "result=%08X", SCpnt->result);
+                        scsi_print_command(SCpnt);
                         acornscsi_dumpdma(host, "done");
-                        acornscsi_dumplog(host, SCpnt->device->id);
-                        SCpnt->result &= 0xffff;
-                        SCpnt->result |= DID_ERROR << 16;
+                        acornscsi_dumplog(host, SCpnt->device->id);
+                        set_host_byte(SCpnt, DID_ERROR);
                     }
                 }
         }