Skip to content

Commit

Permalink
rts5139: 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 8946b07 commit 38c19ec
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 23 deletions.
30 changes: 9 additions & 21 deletions drivers/staging/rts5139/rts51x_scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1968,18 +1968,16 @@ int slave_configure(struct scsi_device *sdev)

/* we use this macro to help us write into the buffer */
#undef SPRINTF
#define SPRINTF(args...) \
do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)
#define SPRINTF(args...) seq_printf(m, ##args)

int proc_info(struct Scsi_Host *host, char *buffer,
char **start, off_t offset, int length, int inout)
static int write_info(struct Scsi_Host *host, char *buffer, int length)
{
char *pos = buffer;

/* if someone is sending us data, just throw it away */
if (inout)
return length;
return length;
}

static int show_info(struct seq_file *m, struct Scsi_Host *host)
{
/* print the controller name */
SPRINTF(" Host scsi%d: %s\n", host->host_no, RTS51X_NAME);

Expand All @@ -1988,18 +1986,7 @@ int proc_info(struct Scsi_Host *host, char *buffer,
SPRINTF(" Product: RTS51xx USB Card Reader\n");
SPRINTF(" Version: %s\n", DRIVER_VERSION);
SPRINTF(" Build: %s\n", __TIME__);

/*
* Calculate start of next buffer, and return value.
*/
*start = buffer + offset;

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

/* queue a command */
Expand Down Expand Up @@ -2100,7 +2087,8 @@ struct scsi_host_template rts51x_host_template = {
/* basic userland interface stuff */
.name = RTS51X_NAME,
.proc_name = RTS51X_NAME,
.proc_info = proc_info,
.show_info = show_info,
.write_info = write_info,
.info = rts5139_info,

/* command interface -- queued only */
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/rts5139/rts51x_scsi.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@ struct scsi_cmnd;

int slave_alloc(struct scsi_device *sdev);
int slave_configure(struct scsi_device *sdev);
int proc_info(struct Scsi_Host *host, char *buffer,
char **start, off_t offset, int length, int inout);
int queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
int command_abort(struct scsi_cmnd *srb);
int device_reset(struct scsi_cmnd *srb);
Expand Down

0 comments on commit 38c19ec

Please sign in to comment.