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

nsp32: 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:11:39 -04:00
parent 60e8b807a6
commit 35c6e0e512
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/scsi/nsp32.c
View File

@ -192,7 +192,7 @@ static int __init init_nsp32 (void);
static void __exit exit_nsp32 (void); static void __exit exit_nsp32 (void);
/* struct struct scsi_host_template */ /* struct struct scsi_host_template */
static int nsp32_proc_info (struct Scsi_Host *, char *, char **, off_t, int, int); static int nsp32_show_info (struct seq_file *, struct Scsi_Host *);
static int nsp32_detect (struct pci_dev *pdev); static int nsp32_detect (struct pci_dev *pdev);
static int nsp32_queuecommand(struct Scsi_Host *, struct scsi_cmnd *); static int nsp32_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
@ -268,7 +268,7 @@ static void nsp32_dmessage(const char *, int, int, char *, ...);
static struct scsi_host_template nsp32_template = { static struct scsi_host_template nsp32_template = {
.proc_name = "nsp32", .proc_name = "nsp32",
.name = "Workbit NinjaSCSI-32Bi/UDE", .name = "Workbit NinjaSCSI-32Bi/UDE",
.proc_info = nsp32_proc_info, .show_info = nsp32_show_info,
.info = nsp32_info, .info = nsp32_info,
.queuecommand = nsp32_queuecommand, .queuecommand = nsp32_queuecommand,
.can_queue = 1, .can_queue = 1,
@ -1442,19 +1442,10 @@ static irqreturn_t do_nsp32_isr(int irq, void *dev_id)
} }
#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); \
nsp32_dbg(NSP32_DEBUG_PROC, "buffer=0x%p pos=0x%p length=%d %d\n", buffer, pos, length, length - (pos - buffer));\
} \
} while(0)
static int nsp32_proc_info(struct Scsi_Host *host, char *buffer, char **start, static int nsp32_show_info(struct seq_file *m, struct Scsi_Host *host)
off_t offset, int length, int inout)
{ {
char *pos = buffer;
int thislength;
unsigned long flags; unsigned long flags;
nsp32_hw_data *data; nsp32_hw_data *data;
int hostno; int hostno;
@ -1463,11 +1454,6 @@ static int nsp32_proc_info(struct Scsi_Host *host, char *buffer, char **start,
int id, speed; int id, speed;
long model; long model;
/* Write is not supported, just return. */
if (inout == TRUE) {
return -EINVAL;
}
hostno = host->host_no; hostno = host->host_no;
data = (nsp32_hw_data *)host->hostdata; data = (nsp32_hw_data *)host->hostdata;
base = host->io_port; base = host->io_port;
@ -1527,20 +1513,7 @@ static int nsp32_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