diff options
Diffstat (limited to 'drivers/ide/legacy/dtc2278.c')
-rw-r--r-- | drivers/ide/legacy/dtc2278.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c index 3b1d33baaa2f..0219ffa64db6 100644 --- a/drivers/ide/legacy/dtc2278.c +++ b/drivers/ide/legacy/dtc2278.c | |||
@@ -4,8 +4,6 @@ | |||
4 | * Copyright (C) 1996 Linus Torvalds & author (see below) | 4 | * Copyright (C) 1996 Linus Torvalds & author (see below) |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | ||
8 | |||
9 | #include <linux/module.h> | 7 | #include <linux/module.h> |
10 | #include <linux/types.h> | 8 | #include <linux/types.h> |
11 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
@@ -94,7 +92,7 @@ static void tune_dtc2278 (ide_drive_t *drive, u8 pio) | |||
94 | HWIF(drive)->drives[!drive->select.b.unit].io_32bit = 1; | 92 | HWIF(drive)->drives[!drive->select.b.unit].io_32bit = 1; |
95 | } | 93 | } |
96 | 94 | ||
97 | static int __init probe_dtc2278(void) | 95 | static int __init dtc2278_probe(void) |
98 | { | 96 | { |
99 | unsigned long flags; | 97 | unsigned long flags; |
100 | ide_hwif_t *hwif, *mate; | 98 | ide_hwif_t *hwif, *mate; |
@@ -145,10 +143,18 @@ static int __init probe_dtc2278(void) | |||
145 | return 0; | 143 | return 0; |
146 | } | 144 | } |
147 | 145 | ||
146 | int probe_dtc2278 = 0; | ||
147 | |||
148 | module_param_named(probe, probe_dtc2278, bool, 0); | ||
149 | MODULE_PARM_DESC(probe, "probe for DTC2278xx chipsets"); | ||
150 | |||
148 | /* Can be called directly from ide.c. */ | 151 | /* Can be called directly from ide.c. */ |
149 | int __init dtc2278_init(void) | 152 | int __init dtc2278_init(void) |
150 | { | 153 | { |
151 | if (probe_dtc2278()) { | 154 | if (probe_dtc2278 == 0) |
155 | return -ENODEV; | ||
156 | |||
157 | if (dtc2278_probe()) { | ||
152 | printk(KERN_ERR "dtc2278: ide interfaces already in use!\n"); | 158 | printk(KERN_ERR "dtc2278: ide interfaces already in use!\n"); |
153 | return -EBUSY; | 159 | return -EBUSY; |
154 | } | 160 | } |