Commit d32812ae authored by Al Viro's avatar Al Viro

dc395x: switch to ->show_info()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ff98f7ce
...@@ -4616,26 +4616,21 @@ static void adapter_uninit(struct AdapterCtlBlk *acb) ...@@ -4616,26 +4616,21 @@ static void adapter_uninit(struct AdapterCtlBlk *acb)
#undef SPRINTF #undef SPRINTF
#define SPRINTF(args...) pos += sprintf(pos, args) #define SPRINTF(args...) seq_printf(m,##args)
#undef YESNO #undef YESNO
#define YESNO(YN) \ #define YESNO(YN) \
if (YN) SPRINTF(" Yes ");\ if (YN) SPRINTF(" Yes ");\
else SPRINTF(" No ") else SPRINTF(" No ")
static int dc395x_proc_info(struct Scsi_Host *host, char *buffer, static int dc395x_show_info(struct seq_file *m, struct Scsi_Host *host)
char **start, off_t offset, int length, int inout)
{ {
struct AdapterCtlBlk *acb = (struct AdapterCtlBlk *)host->hostdata; struct AdapterCtlBlk *acb = (struct AdapterCtlBlk *)host->hostdata;
int spd, spd1; int spd, spd1;
char *pos = buffer;
struct DeviceCtlBlk *dcb; struct DeviceCtlBlk *dcb;
unsigned long flags; unsigned long flags;
int dev; int dev;
if (inout) /* Has data been written to the file ? */
return -EPERM;
SPRINTF(DC395X_BANNER " PCI SCSI Host Adapter\n"); SPRINTF(DC395X_BANNER " PCI SCSI Host Adapter\n");
SPRINTF(" Driver Version " DC395X_VERSION "\n"); SPRINTF(" Driver Version " DC395X_VERSION "\n");
...@@ -4735,22 +4730,15 @@ static int dc395x_proc_info(struct Scsi_Host *host, char *buffer, ...@@ -4735,22 +4730,15 @@ static int dc395x_proc_info(struct Scsi_Host *host, char *buffer,
SPRINTF("END\n"); SPRINTF("END\n");
} }
*start = buffer + offset;
DC395x_UNLOCK_IO(acb->scsi_host, flags); DC395x_UNLOCK_IO(acb->scsi_host, flags);
return 0;
if (pos - buffer < offset)
return 0;
else if (pos - buffer - offset < length)
return pos - buffer - offset;
else
return length;
} }
static struct scsi_host_template dc395x_driver_template = { static struct scsi_host_template dc395x_driver_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.proc_name = DC395X_NAME, .proc_name = DC395X_NAME,
.proc_info = dc395x_proc_info, .show_info = dc395x_show_info,
.name = DC395X_BANNER " " DC395X_VERSION, .name = DC395X_BANNER " " DC395X_VERSION,
.queuecommand = dc395x_queue_command, .queuecommand = dc395x_queue_command,
.bios_param = dc395x_bios_param, .bios_param = dc395x_bios_param,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment