Merge branch 'v3.10/topic/configs' into linux-linaro-lsk-v3.10

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / arm / cumana_2.c

diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index e3bae93c3c22c3a82efa0d337b3eea9a7a650b60..58915f29055b8050774ce2610f987092ad8d60a1 100644 (file)
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -337,50 +337,25 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
        return ret;
 }
 
-/* Prototype: int cumanascsi_2_proc_info(char *buffer, char **start, off_t offset,
- *                                      int length, int host_no, int inout)
- * Purpose  : Return information about the driver to a user process accessing
- *           the /proc filesystem.
- * Params   : buffer - a buffer to write information to
- *           start  - a pointer into this buffer set by this routine to the start
- *                    of the required information.
- *           offset - offset into information that we have read up to.
- *           length - length of buffer
- *           host_no - host number to return information for
- *           inout  - 0 for reading, 1 for writing.
- * Returns  : length of data written to buffer.
- */
-int cumanascsi_2_proc_info (struct Scsi_Host *host, char *buffer, char **start, off_t offset,
-                           int length, int inout)
+static int cumanascsi_2_show_info(struct seq_file *m, struct Scsi_Host *host)
 {
        struct cumanascsi2_info *info;
-       char *p = buffer;
-       int pos;
-
-       if (inout == 1)
-               return cumanascsi_2_set_proc_info(host, buffer, length);
-
        info = (struct cumanascsi2_info *)host->hostdata;
 
-       p += sprintf(p, "Cumana SCSI II driver v%s\n", VERSION);
-       p += fas216_print_host(&info->info, p);
-       p += sprintf(p, "Term    : o%s\n",
+       seq_printf(m, "Cumana SCSI II driver v%s\n", VERSION);
+       fas216_print_host(&info->info, m);
+       seq_printf(m, "Term    : o%s\n",
                        info->terms ? "n" : "ff");
 
-       p += fas216_print_stats(&info->info, p);
-       p += fas216_print_devices(&info->info, p);
-
-       *start = buffer + offset;
-       pos = p - buffer - offset;
-       if (pos > length)
-               pos = length;
-
-       return pos;
+       fas216_print_stats(&info->info, m);
+       fas216_print_devices(&info->info, m);
+       return 0;
 }
 
 static struct scsi_host_template cumanascsi2_template = {
        .module                         = THIS_MODULE,
-       .proc_info                      = cumanascsi_2_proc_info,
+       .show_info                      = cumanascsi_2_show_info,
+       .write_info                     = cumanascsi_2_set_proc_info,
        .name                           = "Cumana SCSI II",
        .info                           = cumanascsi_2_info,
        .queuecommand                   = fas216_queue_command,