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

[cascardo/linux.git] / drivers / scsi / aha1740.c

diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index df775e6..5f31017 100644 (file)
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -106,33 +106,14 @@ static inline dma_addr_t ecb_cpu_to_dma (struct Scsi_Host *host, void *cpu)
        return hdata->ecb_dma_addr + offset;
 }
 
-static int aha1740_proc_info(struct Scsi_Host *shpnt, char *buffer,
-                            char **start, off_t offset,
-                            int length, int inout)
+static int aha1740_show_info(struct seq_file *m, struct Scsi_Host *shpnt)
 {
-       int len;
-       struct aha1740_hostdata *host;
-
-       if (inout)
-               return-ENOSYS;
-
-       host = HOSTDATA(shpnt);
-
-       len = sprintf(buffer, "aha174x at IO:%lx, IRQ %d, SLOT %d.\n"
+       struct aha1740_hostdata *host = HOSTDATA(shpnt);
+       seq_printf(m, "aha174x at IO:%lx, IRQ %d, SLOT %d.\n"
                      "Extended translation %sabled.\n",
                      shpnt->io_port, shpnt->irq, host->edev->slot,
                      host->translation ? "en" : "dis");
-
-       if (offset > len) {
-               *start = buffer;
-               return 0;
-       }
-
-       *start = buffer + offset;
-       len -= offset;
-       if (len > length)
-               len = length;
-       return len;
+       return 0;
 }
 
 static int aha1740_makecode(unchar *sense, unchar *status)
@@ -556,7 +537,7 @@ static int aha1740_eh_abort_handler (Scsi_Cmnd *dummy)
 static struct scsi_host_template aha1740_template = {
        .module           = THIS_MODULE,
        .proc_name        = "aha1740",
-       .proc_info        = aha1740_proc_info,
+       .show_info        = aha1740_show_info,
        .name             = "Adaptec 174x (EISA)",
        .queuecommand     = aha1740_queuecommand,
        .bios_param       = aha1740_biosparam,