Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / rts5139 / rts51x_scsi.c

diff --git a/drivers/staging/rts5139/rts51x_scsi.c b/drivers/staging/rts5139/rts51x_scsi.c
index b58f1dfe006df46aaacec6bb8d59c72855e1a000..61087054640676ba8b734dda3aa5570f81ae61bb 100644 (file)
--- a/drivers/staging/rts5139/rts51x_scsi.c
+++ b/drivers/staging/rts5139/rts51x_scsi.c
@@ -1968,18 +1968,16 @@ int slave_configure(struct scsi_device *sdev)
 
 /* we use this macro to help us write into the buffer */
 #undef SPRINTF
-#define SPRINTF(args...) \
-       do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)
+#define SPRINTF(args...) seq_printf(m, ##args)
 
-int proc_info(struct Scsi_Host *host, char *buffer,
-             char **start, off_t offset, int length, int inout)
+static int write_info(struct Scsi_Host *host, char *buffer, int length)
 {
-       char *pos = buffer;
-
        /* if someone is sending us data, just throw it away */
-       if (inout)
-               return length;
+       return length;
+}
 
+static int show_info(struct seq_file *m, struct Scsi_Host *host)
+{
        /* print the controller name */
        SPRINTF("   Host scsi%d: %s\n", host->host_no, RTS51X_NAME);
 
@@ -1988,18 +1986,7 @@ int proc_info(struct Scsi_Host *host, char *buffer,
        SPRINTF("      Product: RTS51xx USB Card Reader\n");
        SPRINTF("      Version: %s\n", DRIVER_VERSION);
        SPRINTF("        Build: %s\n", __TIME__);
-
-       /*
-        * Calculate start of next buffer, and return value.
-        */
-       *start = buffer + offset;
-
-       if ((pos - buffer) < offset)
-               return 0;
-       else if ((pos - buffer - offset) < length)
-               return pos - buffer - offset;
-       else
-               return length;
+       return 0;
 }
 
 /* queue a command */
@@ -2100,7 +2087,8 @@ struct scsi_host_template rts51x_host_template = {
        /* basic userland interface stuff */
        .name = RTS51X_NAME,
        .proc_name = RTS51X_NAME,
-       .proc_info = proc_info,
+       .show_info = show_info,
+       .write_info = write_info,
        .info = rts5139_info,
 
        /* command interface -- queued only */