scsi: remove SPRINTF macro

The macro SPRINTF doesn't save a lot of typing or make the code more
readable, and depending on a specific identifier (m) in the
surrounding scope is generally frowned upon. Nuke it.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Christoph Hellwig <hch@lst.de>

1 files changed, 19 insertions, 22 deletions

diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 90abb03c9074..3e775517628d 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -1441,8 +1441,6 @@ static irqreturn_t do_nsp32_isr(int irq, void *dev_id)
         return IRQ_RETVAL(handled);
 }
 
-#undef SPRINTF
-#define SPRINTF(args...) seq_printf(m, ##args)
 
 static int nsp32_show_info(struct seq_file *m, struct Scsi_Host *host)
 {
@@ -1458,64 +1456,63 @@ static int nsp32_show_info(struct seq_file *m, struct Scsi_Host *host)
         data = (nsp32_hw_data *)host->hostdata;
         base = host->io_port;
 
-        SPRINTF("NinjaSCSI-32 status\n\n");
-        SPRINTF("Driver version:        %s, $Revision: 1.33 $\n", nsp32_release_version);
-        SPRINTF("SCSI host No.:         %d\n",          hostno);
-        SPRINTF("IRQ:                   %d\n",          host->irq);
-        SPRINTF("IO:                    0x%lx-0x%lx\n", host->io_port, host->io_port + host->n_io_port - 1);
-        SPRINTF("MMIO(virtual address): 0x%lx-0x%lx\n", host->base, host->base + data->MmioLength - 1);
-        SPRINTF("sg_tablesize:          %d\n",          host->sg_tablesize);
-        SPRINTF("Chip revision:         0x%x\n",        (nsp32_read2(base, INDEX_REG) >> 8) & 0xff);
+        seq_printf(m, "NinjaSCSI-32 status\n\n");
+        seq_printf(m, "Driver version:        %s, $Revision: 1.33 $\n", nsp32_release_version);
+        seq_printf(m, "SCSI host No.:         %d\n",            hostno);
+        seq_printf(m, "IRQ:                   %d\n",            host->irq);
+        seq_printf(m, "IO:                    0x%lx-0x%lx\n", host->io_port, host->io_port + host->n_io_port - 1);
+        seq_printf(m, "MMIO(virtual address): 0x%lx-0x%lx\n",   host->base, host->base + data->MmioLength - 1);
+        seq_printf(m, "sg_tablesize:          %d\n",            host->sg_tablesize);
+        seq_printf(m, "Chip revision:         0x%x\n",          (nsp32_read2(base, INDEX_REG) >> 8) & 0xff);
 
         mode_reg = nsp32_index_read1(base, CHIP_MODE);
         model    = data->pci_devid->driver_data;
 
 #ifdef CONFIG_PM
-        SPRINTF("Power Management:      %s\n",          (mode_reg & OPTF) ? "yes" : "no");
+        seq_printf(m, "Power Management:      %s\n",          (mode_reg & OPTF) ? "yes" : "no");
 #endif
-        SPRINTF("OEM:                   %ld, %s\n",     (mode_reg & (OEM0|OEM1)), nsp32_model[model]);
+        seq_printf(m, "OEM:                   %ld, %s\n",     (mode_reg & (OEM0|OEM1)), nsp32_model[model]);
 
         spin_lock_irqsave(&(data->Lock), flags);
-        SPRINTF("CurrentSC:             0x%p\n\n",      data->CurrentSC);
+        seq_printf(m, "CurrentSC:             0x%p\n\n",      data->CurrentSC);
         spin_unlock_irqrestore(&(data->Lock), flags);
 
 
-        SPRINTF("SDTR status\n");
+        seq_printf(m, "SDTR status\n");
         for (id = 0; id < ARRAY_SIZE(data->target); id++) {
 
-                SPRINTF("id %d: ", id);
+                seq_printf(m, "id %d: ", id);
 
                 if (id == host->this_id) {
-                        SPRINTF("----- NinjaSCSI-32 host adapter\n");
+                        seq_printf(m, "----- NinjaSCSI-32 host adapter\n");
                         continue;
                 }
 
                 if (data->target[id].sync_flag == SDTR_DONE) {
                         if (data->target[id].period == 0            &&
                             data->target[id].offset == ASYNC_OFFSET ) {
-                                SPRINTF("async");
+                                seq_printf(m, "async");
                         } else {
-                                SPRINTF(" sync");
+                                seq_printf(m, " sync");
                         }
                 } else {
-                        SPRINTF(" none");
+                        seq_printf(m, " none");
                 }
 
                 if (data->target[id].period != 0) {
 
                         speed = 1000000 / (data->target[id].period * 4);
 
-                        SPRINTF(" transfer %d.%dMB/s, offset %d",
+                        seq_printf(m, " transfer %d.%dMB/s, offset %d",
                                 speed / 1000,
                                 speed % 1000,
                                 data->target[id].offset
                                 );
                 }
-                SPRINTF("\n");
+                seq_printf(m, "\n");
         }
         return 0;
 }
-#undef SPRINTF