git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ide: add ide_proc_register_port()
[safe/jmp/linux-2.6]
/
drivers
/
ide
/
legacy
/
qd65xx.c
diff --git
a/drivers/ide/legacy/qd65xx.c
b/drivers/ide/legacy/qd65xx.c
index
ab482c8
..
d1414a7
100644
(file)
--- a/
drivers/ide/legacy/qd65xx.c
+++ b/
drivers/ide/legacy/qd65xx.c
@@
-427,7
+427,7
@@
static int __init qd_probe(int base)
qd_setup(hwif, base, config, QD6500_DEF_DATA, QD6500_DEF_DATA,
&qd6500_tune_drive);
qd_setup(hwif, base, config, QD6500_DEF_DATA, QD6500_DEF_DATA,
&qd6500_tune_drive);
-
create_proc_ide_interfaces(
);
+
ide_proc_register_port(hwif
);
return 1;
}
return 1;
}
@@
-459,7
+459,7
@@
static int __init qd_probe(int base)
&qd6580_tune_drive);
qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
&qd6580_tune_drive);
qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
-
create_proc_ide_interfaces(
);
+
ide_proc_register_port(hwif
);
return 1;
} else {
return 1;
} else {
@@
-479,7
+479,8
@@
static int __init qd_probe(int base)
&qd6580_tune_drive);
qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
&qd6580_tune_drive);
qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
- create_proc_ide_interfaces();
+ ide_proc_register_port(hwif);
+ ide_proc_register_port(mate);
return 0; /* no other qd65xx possible */
}
return 0; /* no other qd65xx possible */
}
@@
-488,9
+489,17
@@
static int __init qd_probe(int base)
return 1;
}
return 1;
}
+int probe_qd65xx = 0;
+
+module_param_named(probe, probe_qd65xx, bool, 0);
+MODULE_PARM_DESC(probe, "probe for QD65xx chipsets");
+
/* Can be called directly from ide.c. */
int __init qd65xx_init(void)
{
/* Can be called directly from ide.c. */
int __init qd65xx_init(void)
{
+ if (probe_qd65xx == 0)
+ return -ENODEV;
+
if (qd_probe(0x30))
qd_probe(0xb0);
if (ide_hwifs[0].chipset != ide_qd65xx &&
if (qd_probe(0x30))
qd_probe(0xb0);
if (ide_hwifs[0].chipset != ide_qd65xx &&