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