aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-03-31 03:15:00 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-04-09 14:13:23 -0400
commite633c1e55731cd3e85285aa0c792dafb54ae7225 (patch)
treebc6b76ea5f608b96250b22c2c6008fdbd1dec518
parent275084cbff47f8a3f4b6f86464d08da6691424db (diff)
aha1740: switch to ->show_info()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--drivers/scsi/aha1740.c29
1 files changed, 5 insertions, 24 deletions
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index df775e6ba579..5f3101797c93 100644
--- 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)
106 return hdata->ecb_dma_addr + offset; 106 return hdata->ecb_dma_addr + offset;
107} 107}
108 108
109static int aha1740_proc_info(struct Scsi_Host *shpnt, char *buffer, 109static int aha1740_show_info(struct seq_file *m, struct Scsi_Host *shpnt)
110 char **start, off_t offset,
111 int length, int inout)
112{ 110{
113 int len; 111 struct aha1740_hostdata *host = HOSTDATA(shpnt);
114 struct aha1740_hostdata *host; 112 seq_printf(m, "aha174x at IO:%lx, IRQ %d, SLOT %d.\n"
115
116 if (inout)
117 return-ENOSYS;
118
119 host = HOSTDATA(shpnt);
120
121 len = sprintf(buffer, "aha174x at IO:%lx, IRQ %d, SLOT %d.\n"
122 "Extended translation %sabled.\n", 113 "Extended translation %sabled.\n",
123 shpnt->io_port, shpnt->irq, host->edev->slot, 114 shpnt->io_port, shpnt->irq, host->edev->slot,
124 host->translation ? "en" : "dis"); 115 host->translation ? "en" : "dis");
125 116 return 0;
126 if (offset > len) {
127 *start = buffer;
128 return 0;
129 }
130
131 *start = buffer + offset;
132 len -= offset;
133 if (len > length)
134 len = length;
135 return len;
136} 117}
137 118
138static int aha1740_makecode(unchar *sense, unchar *status) 119static int aha1740_makecode(unchar *sense, unchar *status)
@@ -556,7 +537,7 @@ static int aha1740_eh_abort_handler (Scsi_Cmnd *dummy)
556static struct scsi_host_template aha1740_template = { 537static struct scsi_host_template aha1740_template = {
557 .module = THIS_MODULE, 538 .module = THIS_MODULE,
558 .proc_name = "aha1740", 539 .proc_name = "aha1740",
559 .proc_info = aha1740_proc_info, 540 .show_info = aha1740_show_info,
560 .name = "Adaptec 174x (EISA)", 541 .name = "Adaptec 174x (EISA)",
561 .queuecommand = aha1740_queuecommand, 542 .queuecommand = aha1740_queuecommand,
562 .bios_param = aha1740_biosparam, 543 .bios_param = aha1740_biosparam,