lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

acornscsi: switch to ->show_info()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2013-03-31 12:02:39 -04:00
parent 9d4e5c54a3
commit 56b8e8e535
1 changed files with 17 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/scsi/arm/acornscsi.c
View File

@@ -2836,20 +2836,15 @@ char *acornscsi_info(struct Scsi_Host *host)
return string; return string;
} }
int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start, off_t offset, static int acornscsi_show_info(struct seq_file *m, struct Scsi_Host *instance)
int length, int inout)
{ {
int pos, begin = 0, devidx; int devidx;
struct scsi_device *scd; struct scsi_device *scd;
AS_Host *host; AS_Host *host;
char *p = buffer;
if (inout == 1)
return -EINVAL;
host = (AS_Host *)instance->hostdata; host = (AS_Host *)instance->hostdata;
p += sprintf(p, "AcornSCSI driver v%d.%d.%d" seq_printf(m, "AcornSCSI driver v%d.%d.%d"
#ifdef CONFIG_SCSI_ACORNSCSI_SYNC #ifdef CONFIG_SCSI_ACORNSCSI_SYNC
" SYNC" " SYNC"
#endif #endif
@@ -2864,14 +2859,14 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
#endif #endif
"\n\n", VER_MAJOR, VER_MINOR, VER_PATCH); "\n\n", VER_MAJOR, VER_MINOR, VER_PATCH);
p += sprintf(p, "SBIC: WD33C93A Address: %p IRQ : %d\n", seq_printf(m, "SBIC: WD33C93A Address: %p IRQ : %d\n",
host->base + SBIC_REGIDX, host->scsi.irq); host->base + SBIC_REGIDX, host->scsi.irq);
#ifdef USE_DMAC #ifdef USE_DMAC
p += sprintf(p, "DMAC: uPC71071 Address: %p IRQ : %d\n\n", seq_printf(m, "DMAC: uPC71071 Address: %p IRQ : %d\n\n",
host->base + DMAC_OFFSET, host->scsi.irq); host->base + DMAC_OFFSET, host->scsi.irq);
#endif #endif
p += sprintf(p, "Statistics:\n" seq_printf(m, "Statistics:\n"
"Queued commands: %-10u Issued commands: %-10u\n" "Queued commands: %-10u Issued commands: %-10u\n"
"Done commands : %-10u Reads : %-10u\n" "Done commands : %-10u Reads : %-10u\n"
"Writes : %-10u Others : %-10u\n" "Writes : %-10u Others : %-10u\n"
@@ -2886,7 +2881,7 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
for (devidx = 0; devidx < 9; devidx ++) { for (devidx = 0; devidx < 9; devidx ++) {
unsigned int statptr, prev; unsigned int statptr, prev;
p += sprintf(p, "\n%c:", devidx == 8 ? 'H' : ('0' + devidx)); seq_printf(m, "\n%c:", devidx == 8 ? 'H' : ('0' + devidx));
statptr = host->status_ptr[devidx] - 10; statptr = host->status_ptr[devidx] - 10;
if ((signed int)statptr < 0) if ((signed int)statptr < 0)
@@ -2896,7 +2891,7 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
for (; statptr != host->status_ptr[devidx]; statptr = (statptr + 1) & (STATUS_BUFFER_SIZE - 1)) { for (; statptr != host->status_ptr[devidx]; statptr = (statptr + 1) & (STATUS_BUFFER_SIZE - 1)) {
if (host->status[devidx][statptr].when) { if (host->status[devidx][statptr].when) {
p += sprintf(p, "%c%02X:%02X+%2ld", seq_printf(m, "%c%02X:%02X+%2ld",
host->status[devidx][statptr].irq ? '-' : ' ', host->status[devidx][statptr].irq ? '-' : ' ',
host->status[devidx][statptr].ph, host->status[devidx][statptr].ph,
host->status[devidx][statptr].ssr, host->status[devidx][statptr].ssr,
@@ -2907,51 +2902,32 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
} }
} }
p += sprintf(p, "\nAttached devices:\n"); seq_printf(m, "\nAttached devices:\n");
shost_for_each_device(scd, instance) { shost_for_each_device(scd, instance) {
p += sprintf(p, "Device/Lun TaggedQ Sync\n"); seq_printf(m, "Device/Lun TaggedQ Sync\n");
p += sprintf(p, " %d/%d ", scd->id, scd->lun); seq_printf(m, " %d/%d ", scd->id, scd->lun);
if (scd->tagged_supported) if (scd->tagged_supported)
p += sprintf(p, "%3sabled(%3d) ", seq_printf(m, "%3sabled(%3d) ",
scd->simple_tags ? "en" : "dis", scd->simple_tags ? "en" : "dis",
scd->current_tag); scd->current_tag);
else else
p += sprintf(p, "unsupported "); seq_printf(m, "unsupported ");
if (host->device[scd->id].sync_xfer & 15) if (host->device[scd->id].sync_xfer & 15)
p += sprintf(p, "offset %d, %d ns\n", seq_printf(m, "offset %d, %d ns\n",
host->device[scd->id].sync_xfer & 15, host->device[scd->id].sync_xfer & 15,
acornscsi_getperiod(host->device[scd->id].sync_xfer)); acornscsi_getperiod(host->device[scd->id].sync_xfer));
else else
p += sprintf(p, "async\n"); seq_printf(m, "async\n");
pos = p - buffer;
if (pos + begin < offset) {
begin += pos;
p = buffer;
}
pos = p - buffer;
if (pos + begin > offset + length) {
scsi_device_put(scd);
break;
}
} }
return 0;
pos = p - buffer;
*start = buffer + (offset - begin);
pos -= offset - begin;
if (pos > length)
pos = length;
return pos;
} }
static struct scsi_host_template acornscsi_template = { static struct scsi_host_template acornscsi_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.proc_info = acornscsi_proc_info, .show_info = acornscsi_show_info,
.name = "AcornSCSI", .name = "AcornSCSI",
.info = acornscsi_info, .info = acornscsi_info,
.queuecommand = acornscsi_queuecmd, .queuecommand = acornscsi_queuecmd,