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, 23 insertions, 27 deletions

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 34aad32829f5..83db942d6913 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1364,9 +1364,6 @@ static const char *nsp_info(struct Scsi_Host *shpnt)
         return data->nspinfo;
 }
 
-#undef SPRINTF
-#define SPRINTF(args...) seq_printf(m, ##args)
-
 static int nsp_show_info(struct seq_file *m, struct Scsi_Host *host)
 {
         int id;
@@ -1378,75 +1375,74 @@ static int nsp_show_info(struct seq_file *m, struct Scsi_Host *host)
         hostno = host->host_no;
         data = (nsp_hw_data *)host->hostdata;
 
-        SPRINTF("NinjaSCSI status\n\n");
-        SPRINTF("Driver version:        $Revision: 1.23 $\n");
-        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);
+        seq_printf(m, "NinjaSCSI status\n\n");
+        seq_printf(m, "Driver version:        $Revision: 1.23 $\n");
+        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);
 
-        SPRINTF("burst transfer mode:   ");
+        seq_printf(m, "burst transfer mode:   ");
         switch (nsp_burst_mode) {
         case BURST_IO8:
-                SPRINTF("io8");
+                seq_printf(m, "io8");
                 break;
         case BURST_IO32:
-                SPRINTF("io32");
+                seq_printf(m, "io32");
                 break;
         case BURST_MEM32:
-                SPRINTF("mem32");
+                seq_printf(m, "mem32");
                 break;
         default:
-                SPRINTF("???");
+                seq_printf(m, "???");
                 break;
         }
-        SPRINTF("\n");
+        seq_printf(m, "\n");
 
 
         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->Sync); id++) {
 
-                SPRINTF("id %d: ", id);
+                seq_printf(m, "id %d: ", id);
 
                 if (id == host->this_id) {
-                        SPRINTF("----- NinjaSCSI-3 host adapter\n");
+                        seq_printf(m, "----- NinjaSCSI-3 host adapter\n");
                         continue;
                 }
 
                 switch(data->Sync[id].SyncNegotiation) {
                 case SYNC_OK:
-                        SPRINTF(" sync");
+                        seq_printf(m, " sync");
                         break;
                 case SYNC_NG:
-                        SPRINTF("async");
+                        seq_printf(m, "async");
                         break;
                 case SYNC_NOT_YET:
-                        SPRINTF(" none");
+                        seq_printf(m, " none");
                         break;
                 default:
-                        SPRINTF("?????");
+                        seq_printf(m, "?????");
                         break;
                 }
 
                 if (data->Sync[id].SyncPeriod != 0) {
                         speed = 1000000 / (data->Sync[id].SyncPeriod * 4);
 
-                        SPRINTF(" transfer %d.%dMB/s, offset %d",
+                        seq_printf(m, " transfer %d.%dMB/s, offset %d",
                                 speed / 1000,
                                 speed % 1000,
                                 data->Sync[id].SyncOffset
                                 );
                 }
-                SPRINTF("\n");
+                seq_printf(m, "\n");
         }
         return 0;
 }
-#undef SPRINTF
 
 /*---------------------------------------------------------------*/
 /* error handler                                                 */