ide: init hwif->{io_ports,irq} explicitly in legacy VLB host drivers
Do explicit port setup in legacy VLB host drivers instead of depending on init_ide_data(). This way hwif->io_ports[] and hwif->irq are always correctly set regardless of CONFIG_PCI / CONFIG_BLK_DEV_IDEPCI. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
@@ -103,6 +103,7 @@ static int __init dtc2278_probe(void)
|
||||
unsigned long flags;
|
||||
ide_hwif_t *hwif, *mate;
|
||||
static u8 idx[4] = { 0, 1, 0xff, 0xff };
|
||||
hw_regs_t hw[2];
|
||||
|
||||
hwif = &ide_hwifs[0];
|
||||
mate = &ide_hwifs[1];
|
||||
@@ -128,6 +129,17 @@ static int __init dtc2278_probe(void)
|
||||
#endif
|
||||
local_irq_restore(flags);
|
||||
|
||||
memset(&hw, 0, sizeof(hw));
|
||||
|
||||
ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);
|
||||
hw[0].irq = 14;
|
||||
|
||||
ide_std_init_ports(&hw[1], 0x170, 0x376);
|
||||
hw[1].irq = 15;
|
||||
|
||||
ide_init_port_hw(hwif, &hw[0]);
|
||||
ide_init_port_hw(mate, &hw[1]);
|
||||
|
||||
hwif->set_pio_mode = &dtc2278_set_pio_mode;
|
||||
|
||||
ide_device_add(idx, &dtc2278_port_info);
|
||||
|
||||
Reference in New Issue
Block a user