aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ibmmca.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/ibmmca.c')
-rw-r--r--drivers/scsi/ibmmca.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index 887a5c3ded28..b60c1b9270f1 100644
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -18,12 +18,6 @@
18 */ 18 */
19 19
20#include <linux/config.h> 20#include <linux/config.h>
21#ifndef LINUX_VERSION_CODE
22#include <linux/version.h>
23#endif
24#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,45)
25#error "This driver works only with kernel 2.5.45 or higher!"
26#endif
27#include <linux/module.h> 21#include <linux/module.h>
28#include <linux/kernel.h> 22#include <linux/kernel.h>
29#include <linux/types.h> 23#include <linux/types.h>
@@ -498,7 +492,7 @@ static char *ibmrate(unsigned int, int);
498static int probe_display(int); 492static int probe_display(int);
499static int probe_bus_mode(int); 493static int probe_bus_mode(int);
500static int device_exists(int, int, int *, int *); 494static int device_exists(int, int, int *, int *);
501static struct Scsi_Host *ibmmca_register(Scsi_Host_Template *, int, int, int, char *); 495static struct Scsi_Host *ibmmca_register(struct scsi_host_template *, int, int, int, char *);
502static int option_setup(char *); 496static int option_setup(char *);
503/* local functions needed for proc_info */ 497/* local functions needed for proc_info */
504static int ldn_access_load(int, int); 498static int ldn_access_load(int, int);
@@ -1489,7 +1483,7 @@ static int ibmmca_getinfo(char *buf, int slot, void *dev_id)
1489 return len; 1483 return len;
1490} 1484}
1491 1485
1492int ibmmca_detect(Scsi_Host_Template * scsi_template) 1486int ibmmca_detect(struct scsi_host_template * scsi_template)
1493{ 1487{
1494 struct Scsi_Host *shpnt; 1488 struct Scsi_Host *shpnt;
1495 int port, id, i, j, k, list_size, slot; 1489 int port, id, i, j, k, list_size, slot;
@@ -1742,7 +1736,7 @@ int ibmmca_detect(Scsi_Host_Template * scsi_template)
1742 return found; /* return the number of found SCSI hosts. Should be 1 or 0. */ 1736 return found; /* return the number of found SCSI hosts. Should be 1 or 0. */
1743} 1737}
1744 1738
1745static struct Scsi_Host *ibmmca_register(Scsi_Host_Template * scsi_template, int port, int id, int adaptertype, char *hostname) 1739static struct Scsi_Host *ibmmca_register(struct scsi_host_template * scsi_template, int port, int id, int adaptertype, char *hostname)
1746{ 1740{
1747 struct Scsi_Host *shpnt; 1741 struct Scsi_Host *shpnt;
1748 int i, j; 1742 int i, j;
@@ -2500,7 +2494,7 @@ static int option_setup(char *str)
2500 2494
2501__setup("ibmmcascsi=", option_setup); 2495__setup("ibmmcascsi=", option_setup);
2502 2496
2503static Scsi_Host_Template driver_template = { 2497static struct scsi_host_template driver_template = {
2504 .proc_name = "ibmmca", 2498 .proc_name = "ibmmca",
2505 .proc_info = ibmmca_proc_info, 2499 .proc_info = ibmmca_proc_info,
2506 .name = "IBM SCSI-Subsystem", 2500 .name = "IBM SCSI-Subsystem",