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

rts5139: 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 02:04:33 -04:00
parent 8946b077ca
commit 38c19ec9f7
2 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/rts5139/rts51x_scsi.c
View File

@@ -1968,18 +1968,16 @@ int slave_configure(struct scsi_device *sdev)
/* we use this macro to help us write into the buffer */ /* we use this macro to help us write into the buffer */
#undef SPRINTF #undef SPRINTF
#define SPRINTF(args...) \ #define SPRINTF(args...) seq_printf(m, ##args)
do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)
int proc_info(struct Scsi_Host *host, char *buffer, static int write_info(struct Scsi_Host *host, char *buffer, int length)
char **start, off_t offset, int length, int inout)
{ {
char *pos = buffer;
/* if someone is sending us data, just throw it away */ /* 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 */ /* print the controller name */
SPRINTF(" Host scsi%d: %s\n", host->host_no, RTS51X_NAME); SPRINTF(" Host scsi%d: %s\n", host->host_no, RTS51X_NAME);
@@ -1988,18 +1986,7 @@ int proc_info(struct Scsi_Host *host, char *buffer,
SPRINTF(" Product: RTS51xx USB Card Reader\n"); SPRINTF(" Product: RTS51xx USB Card Reader\n");
SPRINTF(" Version: %s\n", DRIVER_VERSION); SPRINTF(" Version: %s\n", DRIVER_VERSION);
SPRINTF(" Build: %s\n", __TIME__); SPRINTF(" Build: %s\n", __TIME__);
return 0;
/*
* 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;
} }
/* queue a command */ /* queue a command */
@@ -2100,7 +2087,8 @@ struct scsi_host_template rts51x_host_template = {
/* basic userland interface stuff */ /* basic userland interface stuff */
.name = RTS51X_NAME, .name = RTS51X_NAME,
.proc_name = RTS51X_NAME, .proc_name = RTS51X_NAME,
.proc_info = proc_info, .show_info = show_info,
.write_info = write_info,
.info = rts5139_info, .info = rts5139_info,
/* command interface -- queued only */ /* command interface -- queued only */

2
drivers/staging/rts5139/rts51x_scsi.h
View File

@@ -147,8 +147,6 @@ struct scsi_cmnd;
int slave_alloc(struct scsi_device *sdev); int slave_alloc(struct scsi_device *sdev);
int slave_configure(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 queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
int command_abort(struct scsi_cmnd *srb); int command_abort(struct scsi_cmnd *srb);
int device_reset(struct scsi_cmnd *srb); int device_reset(struct scsi_cmnd *srb);