Skip to content

Commit

Permalink
dc395x: switch to ->show_info()
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed Apr 9, 2013
1 parent ff98f7c commit d32812a
Showing 1 changed file with 4 additions and 16 deletions.
20 changes: 4 additions & 16 deletions drivers/scsi/dc395x.c
Original file line number Diff line number Diff line change
Expand Up @@ -4616,26 +4616,21 @@ static void adapter_uninit(struct AdapterCtlBlk *acb)


#undef SPRINTF
#define SPRINTF(args...) pos += sprintf(pos, args)
#define SPRINTF(args...) seq_printf(m,##args)

#undef YESNO
#define YESNO(YN) \
if (YN) SPRINTF(" Yes ");\
else SPRINTF(" No ")

static int dc395x_proc_info(struct Scsi_Host *host, char *buffer,
char **start, off_t offset, int length, int inout)
static int dc395x_show_info(struct seq_file *m, struct Scsi_Host *host)
{
struct AdapterCtlBlk *acb = (struct AdapterCtlBlk *)host->hostdata;
int spd, spd1;
char *pos = buffer;
struct DeviceCtlBlk *dcb;
unsigned long flags;
int dev;

if (inout) /* Has data been written to the file ? */
return -EPERM;

SPRINTF(DC395X_BANNER " PCI SCSI Host Adapter\n");
SPRINTF(" Driver Version " DC395X_VERSION "\n");

Expand Down Expand Up @@ -4735,22 +4730,15 @@ static int dc395x_proc_info(struct Scsi_Host *host, char *buffer,
SPRINTF("END\n");
}

*start = buffer + offset;
DC395x_UNLOCK_IO(acb->scsi_host, flags);

if (pos - buffer < offset)
return 0;
else if (pos - buffer - offset < length)
return pos - buffer - offset;
else
return length;
return 0;
}


static struct scsi_host_template dc395x_driver_template = {
.module = THIS_MODULE,
.proc_name = DC395X_NAME,
.proc_info = dc395x_proc_info,
.show_info = dc395x_show_info,
.name = DC395X_BANNER " " DC395X_VERSION,
.queuecommand = dc395x_queue_command,
.bios_param = dc395x_bios_param,
Expand Down

0 comments on commit d32812a

Please sign in to comment.