projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[powerpc.git]
/
drivers
/
scsi
/
ibmmca.c
diff --git
a/drivers/scsi/ibmmca.c
b/drivers/scsi/ibmmca.c
index
887a5c3
..
24eb59e
100644
(file)
--- a/
drivers/scsi/ibmmca.c
+++ b/
drivers/scsi/ibmmca.c
@@
-18,12
+18,6
@@
*/
#include <linux/config.h>
*/
#include <linux/config.h>
-#ifndef LINUX_VERSION_CODE
-#include <linux/version.h>
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,45)
-#error "This driver works only with kernel 2.5.45 or higher!"
-#endif
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-498,7
+492,7
@@
static char *ibmrate(unsigned int, int);
static int probe_display(int);
static int probe_bus_mode(int);
static int device_exists(int, int, int *, int *);
static int probe_display(int);
static int probe_bus_mode(int);
static int device_exists(int, int, int *, int *);
-static struct Scsi_Host *ibmmca_register(
Scsi_Host_T
emplate *, int, int, int, char *);
+static struct Scsi_Host *ibmmca_register(
struct scsi_host_t
emplate *, int, int, int, char *);
static int option_setup(char *);
/* local functions needed for proc_info */
static int ldn_access_load(int, int);
static int option_setup(char *);
/* local functions needed for proc_info */
static int ldn_access_load(int, int);
@@
-1489,7
+1483,7
@@
static int ibmmca_getinfo(char *buf, int slot, void *dev_id)
return len;
}
return len;
}
-int ibmmca_detect(
Scsi_Host_T
emplate * scsi_template)
+int ibmmca_detect(
struct scsi_host_t
emplate * scsi_template)
{
struct Scsi_Host *shpnt;
int port, id, i, j, k, list_size, slot;
{
struct Scsi_Host *shpnt;
int port, id, i, j, k, list_size, slot;
@@
-1742,7
+1736,7
@@
int ibmmca_detect(Scsi_Host_Template * scsi_template)
return found; /* return the number of found SCSI hosts. Should be 1 or 0. */
}
return found; /* return the number of found SCSI hosts. Should be 1 or 0. */
}
-static struct Scsi_Host *ibmmca_register(
Scsi_Host_T
emplate * scsi_template, int port, int id, int adaptertype, char *hostname)
+static struct Scsi_Host *ibmmca_register(
struct scsi_host_t
emplate * scsi_template, int port, int id, int adaptertype, char *hostname)
{
struct Scsi_Host *shpnt;
int i, j;
{
struct Scsi_Host *shpnt;
int i, j;
@@
-2418,8
+2412,7
@@
static int ibmmca_proc_info(struct Scsi_Host *shpnt, char *buffer, char **start,
spin_lock_irqsave(hosts[i]->host_lock, flags); /* Check it */
host_index = i;
if (!shpnt) {
spin_lock_irqsave(hosts[i]->host_lock, flags); /* Check it */
host_index = i;
if (!shpnt) {
- len += sprintf(buffer + len, "\nIBM MCA SCSI: Can't find adapter for host number %d\n",
- shpnt->host_no);
+ len += sprintf(buffer + len, "\nIBM MCA SCSI: Can't find adapter");
return len;
}
max_pun = subsystem_maxid(host_index);
return len;
}
max_pun = subsystem_maxid(host_index);
@@
-2495,12
+2488,12
@@
static int option_setup(char *str)
}
ints[0] = i - 1;
internal_ibmmca_scsi_setup(cur, ints);
}
ints[0] = i - 1;
internal_ibmmca_scsi_setup(cur, ints);
- return
0
;
+ return
1
;
}
__setup("ibmmcascsi=", option_setup);
}
__setup("ibmmcascsi=", option_setup);
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.proc_name = "ibmmca",
.proc_info = ibmmca_proc_info,
.name = "IBM SCSI-Subsystem",
.proc_name = "ibmmca",
.proc_info = ibmmca_proc_info,
.name = "IBM SCSI-Subsystem",