aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/legacy/ide-cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/legacy/ide-cs.c')
-rw-r--r--drivers/ide/legacy/ide-cs.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index 8dbf4d9b6447..27b1e0b7ecb4 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -66,8 +66,6 @@ MODULE_LICENSE("Dual MPL/GPL");
66#ifdef CONFIG_PCMCIA_DEBUG 66#ifdef CONFIG_PCMCIA_DEBUG
67INT_MODULE_PARM(pc_debug, 0); 67INT_MODULE_PARM(pc_debug, 0);
68#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) 68#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
69/*static char *version =
70"ide-cs.c 1.3 2002/10/26 05:45:31 (David Hinds)";*/
71#else 69#else
72#define DEBUG(n, args...) 70#define DEBUG(n, args...)
73#endif 71#endif
@@ -154,6 +152,11 @@ static const struct ide_port_ops idecs_port_ops = {
154 .quirkproc = ide_undecoded_slave, 152 .quirkproc = ide_undecoded_slave,
155}; 153};
156 154
155static const struct ide_port_info idecs_port_info = {
156 .port_ops = &idecs_port_ops,
157 .host_flags = IDE_HFLAG_NO_DMA,
158};
159
157static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl, 160static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
158 unsigned long irq, struct pcmcia_device *handle) 161 unsigned long irq, struct pcmcia_device *handle)
159{ 162{
@@ -187,13 +190,11 @@ static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
187 190
188 i = hwif->index; 191 i = hwif->index;
189 192
190 ide_init_port_data(hwif, i);
191 ide_init_port_hw(hwif, &hw); 193 ide_init_port_hw(hwif, &hw);
192 hwif->port_ops = &idecs_port_ops;
193 194
194 idx[0] = i; 195 idx[0] = i;
195 196
196 ide_device_add(idx, NULL); 197 ide_device_add(idx, &idecs_port_info);
197 198
198 if (hwif->present) 199 if (hwif->present)
199 return hwif; 200 return hwif;