nsp_cs: switch to ->show_info()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index b61a753eb8960c19659a53fc18cf35d35c2e70f1..987fbb1b244e9661be7401d6de906f444840a1ea 100644 (file)
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -76,7 +76,7 @@ MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0
 
 static struct scsi_host_template nsp_driver_template = {
        .proc_name               = "nsp_cs",
-       .proc_info               = nsp_proc_info,
+       .show_info               = nsp_show_info,
        .name                    = "WorkBit NinjaSCSI-3/32Bi(16bit)",
        .info                    = nsp_info,
        .queuecommand            = nsp_queuecommand,
@@ -1365,33 +1365,19 @@ static const char *nsp_info(struct Scsi_Host *shpnt)
 }
 
 #undef SPRINTF
-#define SPRINTF(args...) \
-        do { \
-               if(length > (pos - buffer)) { \
-                       pos += snprintf(pos, length - (pos - buffer) + 1, ## args); \
-                       nsp_dbg(NSP_DEBUG_PROC, "buffer=0x%p pos=0x%p length=%d %d\n", buffer, pos, length,  length - (pos - buffer));\
-               } \
-       } while(0)
-
-static int nsp_proc_info(struct Scsi_Host *host, char *buffer, char **start,
-                        off_t offset, int length, int inout)
+#define SPRINTF(args...) seq_printf(m, ##args)
+
+static int nsp_show_info(struct seq_file *m, struct Scsi_Host *host)
 {
        int id;
-       char *pos = buffer;
-       int thislength;
        int speed;
        unsigned long flags;
        nsp_hw_data *data;
        int hostno;
 
-       if (inout) {
-               return -EINVAL;
-       }
-
        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);
@@ -1458,19 +1444,7 @@ static int nsp_proc_info(struct Scsi_Host *host, char *buffer, char **start,
                }
                SPRINTF("\n");
        }
-
-       thislength = pos - (buffer + offset);
-
-       if(thislength < 0) {
-               *start = NULL;
-                return 0;
-        }
-
-
-       thislength = min(thislength, length);
-       *start = buffer + offset;
-
-       return thislength;
+       return 0;
 }
 #undef SPRINTF
 

diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h
index 7fc9a9d0a448b6a01c42461758ef118f5190ed93..afd64f0adc4baf62a8686fe1f9d554f58e60846b 100644 (file)
--- a/drivers/scsi/pcmcia/nsp_cs.h
+++ b/drivers/scsi/pcmcia/nsp_cs.h
@@ -292,13 +292,8 @@ static int        nsp_cs_config (struct pcmcia_device *link);
 /* Linux SCSI subsystem specific functions */
 static struct Scsi_Host *nsp_detect     (struct scsi_host_template *sht);
 static const  char      *nsp_info       (struct Scsi_Host *shpnt);
-static        int        nsp_proc_info  (
-                                        struct Scsi_Host *host,
-                                        char   *buffer,
-                                        char  **start,
-                                        off_t   offset,
-                                        int     length,
-                                        int     inout);
+static        int        nsp_show_info  (struct seq_file *m,
+                                        struct Scsi_Host *host);
 static int nsp_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *SCpnt);
 
 /* Error handler */