Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nsp_cs: 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:14:18 -04:00
parent 35c6e0e512
commit 63fd57cb5c
2 changed files with 6 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/scsi/pcmcia/nsp_cs.c
View file

@ -76,7 +76,7 @@ MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0
static struct scsi_host_template nsp_driver_template = { static struct scsi_host_template nsp_driver_template = {
.proc_name = "nsp_cs", .proc_name = "nsp_cs",
.proc_info = nsp_proc_info, .show_info = nsp_show_info,
.name = "WorkBit NinjaSCSI-3/32Bi(16bit)", .name = "WorkBit NinjaSCSI-3/32Bi(16bit)",
.info = nsp_info, .info = nsp_info,
.queuecommand = nsp_queuecommand, .queuecommand = nsp_queuecommand,
@ -1365,33 +1365,19 @@ static const char *nsp_info(struct Scsi_Host *shpnt)
} }
#undef SPRINTF #undef SPRINTF
#define SPRINTF(args...) \ #define SPRINTF(args...) seq_printf(m, ##args)
do { \
if(length > (pos - buffer)) { \
pos += snprintf(pos, length - (pos - buffer) + 1, ## args); \
nsp_dbg(NSP_DEBUG_PROC, "buffer=0x%p pos=0x%p length=%d %d\n", buffer, pos, length, length - (pos - buffer));\
} \
} while(0)
static int nsp_proc_info(struct Scsi_Host *host, char *buffer, char **start, static int nsp_show_info(struct seq_file *m, struct Scsi_Host *host)
off_t offset, int length, int inout)
{ {
int id; int id;
char *pos = buffer;
int thislength;
int speed; int speed;
unsigned long flags; unsigned long flags;
nsp_hw_data *data; nsp_hw_data *data;
int hostno; int hostno;
if (inout) {
return -EINVAL;
}
hostno = host->host_no; hostno = host->host_no;
data = (nsp_hw_data *)host->hostdata; data = (nsp_hw_data *)host->hostdata;
SPRINTF("NinjaSCSI status\n\n"); SPRINTF("NinjaSCSI status\n\n");
SPRINTF("Driver version: $Revision: 1.23 $\n"); SPRINTF("Driver version: $Revision: 1.23 $\n");
SPRINTF("SCSI host No.: %d\n", hostno); SPRINTF("SCSI host No.: %d\n", hostno);
@ -1458,19 +1444,7 @@ static int nsp_proc_info(struct Scsi_Host *host, char *buffer, char **start,
} }
SPRINTF("\n"); SPRINTF("\n");
} }
thislength = pos - (buffer + offset);
if(thislength < 0) {
*start = NULL;
return 0; return 0;
}
thislength = min(thislength, length);
*start = buffer + offset;
return thislength;
} }
#undef SPRINTF #undef SPRINTF

9
drivers/scsi/pcmcia/nsp_cs.h
View file

@ -292,13 +292,8 @@ static int nsp_cs_config (struct pcmcia_device *link);
/* Linux SCSI subsystem specific functions */ /* Linux SCSI subsystem specific functions */
static struct Scsi_Host *nsp_detect (struct scsi_host_template *sht); static struct Scsi_Host *nsp_detect (struct scsi_host_template *sht);
static const char *nsp_info (struct Scsi_Host *shpnt); static const char *nsp_info (struct Scsi_Host *shpnt);
static int nsp_proc_info ( static int nsp_show_info (struct seq_file *m,
struct Scsi_Host *host, struct Scsi_Host *host);
char *buffer,
char **start,
off_t offset,
int length,
int inout);
static int nsp_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *SCpnt); static int nsp_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *SCpnt);
/* Error handler */ /* Error handler */