git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
scsi
/
qlogicfas.c
diff --git
a/drivers/scsi/qlogicfas.c
b/drivers/scsi/qlogicfas.c
index
03dbd67
..
94baca8
100644
(file)
--- a/
drivers/scsi/qlogicfas.c
+++ b/
drivers/scsi/qlogicfas.c
@@
-47,7
+47,7
@@
static char qlogicfas_name[] = "qlogicfas";
* Look for qlogic card and init if found
*/
* Look for qlogic card and init if found
*/
-static struct Scsi_Host *__qlogicfas_detect(
Scsi_Host_T
emplate *host,
+static struct Scsi_Host *__qlogicfas_detect(
struct scsi_host_t
emplate *host,
int qbase,
int qlirq)
{
int qbase,
int qlirq)
{
@@
-137,12
+137,12
@@
err:
static struct qlogicfas408_priv *cards;
static int iobase[MAX_QLOGICFAS];
static int irq[MAX_QLOGICFAS] = { [0 ... MAX_QLOGICFAS-1] = -1 };
static struct qlogicfas408_priv *cards;
static int iobase[MAX_QLOGICFAS];
static int irq[MAX_QLOGICFAS] = { [0 ... MAX_QLOGICFAS-1] = -1 };
-
MODULE_PARM(iobase, "1-" __MODULE_STRING(MAX_QLOGICFAS) "i"
);
-
MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_QLOGICFAS) "i"
);
+
module_param_array(iobase, int, NULL, 0
);
+
module_param_array(irq, int, NULL, 0
);
MODULE_PARM_DESC(iobase, "I/O address");
MODULE_PARM_DESC(irq, "IRQ");
MODULE_PARM_DESC(iobase, "I/O address");
MODULE_PARM_DESC(irq, "IRQ");
-static int __devinit qlogicfas_detect(
Scsi_Host_T
emplate *sht)
+static int __devinit qlogicfas_detect(
struct scsi_host_t
emplate *sht)
{
struct Scsi_Host *shost;
struct qlogicfas408_priv *priv;
{
struct Scsi_Host *shost;
struct qlogicfas408_priv *priv;
@@
-183,7
+183,7
@@
static int qlogicfas_release(struct Scsi_Host *shost)
/*
* The driver template is also needed for PCMCIA
*/
/*
* The driver template is also needed for PCMCIA
*/
-static
Scsi_Host_T
emplate qlogicfas_driver_template = {
+static
struct scsi_host_t
emplate qlogicfas_driver_template = {
.module = THIS_MODULE,
.name = qlogicfas_name,
.proc_name = qlogicfas_name,
.module = THIS_MODULE,
.name = qlogicfas_name,
.proc_name = qlogicfas_name,
@@
-191,8
+191,6
@@
static Scsi_Host_Template qlogicfas_driver_template = {
.queuecommand = qlogicfas408_queuecommand,
.eh_abort_handler = qlogicfas408_abort,
.eh_bus_reset_handler = qlogicfas408_bus_reset,
.queuecommand = qlogicfas408_queuecommand,
.eh_abort_handler = qlogicfas408_abort,
.eh_bus_reset_handler = qlogicfas408_bus_reset,
- .eh_device_reset_handler= qlogicfas408_device_reset,
- .eh_host_reset_handler = qlogicfas408_host_reset,
.bios_param = qlogicfas408_biosparam,
.can_queue = 1,
.this_id = -1,
.bios_param = qlogicfas408_biosparam,
.can_queue = 1,
.this_id = -1,