aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:17 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:17 -0400
commite518e58779d946f01bf93428be8791d5f07b4984 (patch)
tree71c3254f44addfa5c01e19b6b5ee0555c06fe07f /drivers/ide
parent9804657ec488380637226d08c808b29ede566908 (diff)
ide-generic: use struct ide_port_info
This fixes hwif->channel and drive->dn assignments. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-generic.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 81a5282ce1eb..9d03e8211536 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -32,6 +32,10 @@ static int probe_mask;
32module_param(probe_mask, int, 0); 32module_param(probe_mask, int, 0);
33MODULE_PARM_DESC(probe_mask, "probe mask for legacy ISA IDE ports"); 33MODULE_PARM_DESC(probe_mask, "probe mask for legacy ISA IDE ports");
34 34
35static const struct ide_port_info ide_generic_port_info = {
36 .host_flags = IDE_HFLAG_NO_DMA,
37};
38
35static ssize_t store_add(struct class *cls, const char *buf, size_t n) 39static ssize_t store_add(struct class *cls, const char *buf, size_t n)
36{ 40{
37 unsigned int base, ctl; 41 unsigned int base, ctl;
@@ -46,7 +50,7 @@ static ssize_t store_add(struct class *cls, const char *buf, size_t n)
46 hw.irq = irq; 50 hw.irq = irq;
47 hw.chipset = ide_generic; 51 hw.chipset = ide_generic;
48 52
49 rc = ide_host_add(NULL, hws, NULL); 53 rc = ide_host_add(&ide_generic_port_info, hws, NULL);
50 if (rc) 54 if (rc)
51 return rc; 55 return rc;
52 56
@@ -184,7 +188,7 @@ static int __init ide_generic_init(void)
184#endif 188#endif
185 hw.chipset = ide_generic; 189 hw.chipset = ide_generic;
186 190
187 rc = ide_host_add(NULL, hws, NULL); 191 rc = ide_host_add(&ide_generic_port_info, hws, NULL);
188 if (rc) { 192 if (rc) {
189 release_region(io_addr + 0x206, 1); 193 release_region(io_addr + 0x206, 1);
190 release_region(io_addr, 8); 194 release_region(io_addr, 8);