leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keucr: 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:08:31 -04:00
parent 38c19ec9f7
commit 60e8b807a6
1 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/staging/keucr/scsiglue.c
View File

@ -229,26 +229,18 @@ void usb_stor_report_bus_reset(struct us_data *us)
/* 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)
/* static int write_info(struct Scsi_Host *host, char *buffer, int length)
* proc_info() {
*/ return length;
static int proc_info(struct Scsi_Host *host, char *buffer, char **start, }
off_t offset, int length, int inout)
static int show_info(struct seq_file *m, struct Scsi_Host *host)
{ {
struct us_data *us = host_to_us(host); struct us_data *us = host_to_us(host);
char *pos = buffer;
const char *string; const char *string;
/* pr_info("scsiglue --- proc_info\n"); */
if (inout)
return length;
/* print the controller name */ /* print the controller name */
SPRINTF(" Host scsi%d: usb-storage\n", host->host_no); SPRINTF(" Host scsi%d: usb-storage\n", host->host_no);
@ -278,29 +270,17 @@ static int proc_info(struct Scsi_Host *host, char *buffer, char **start,
SPRINTF(" Transport: %s\n", us->transport_name); SPRINTF(" Transport: %s\n", us->transport_name);
/* show the device flags */ /* show the device flags */
if (pos < buffer + length) { SPRINTF(" Quirks:");
pos += sprintf(pos, " Quirks:");
#define US_FLAG(name, value) \ #define US_FLAG(name, value) \
do { \ do { \
if (us->fflags & value) \ if (us->fflags & value) \
pos += sprintf(pos, " " #name); \ SPRINTF(" " #name); \
} while (0); } while (0);
US_DO_ALL_FLAGS US_DO_ALL_FLAGS
#undef US_FLAG #undef US_FLAG
seq_putc(m, '\n');
*(pos++) = '\n'; 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;
} }
/*********************************************************************** /***********************************************************************
@ -351,7 +331,8 @@ struct scsi_host_template usb_stor_host_template = {
/* basic userland interface stuff */ /* basic userland interface stuff */
.name = "eucr-storage", .name = "eucr-storage",
.proc_name = "eucr-storage", .proc_name = "eucr-storage",
.proc_info = proc_info, .write_info = write_info,
.show_info = show_info,
.info = host_info, .info = host_info,
/* command interface -- queued only */ /* command interface -- queued only */