diff options
| author | Bartlomiej Zolnierkiewicz | 2008-04-27 15:38:32 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2008-04-27 15:38:32 +0200 |
| commit | 4c3032d8a4d6c97bd6e02bcab524ef2428d89561 (patch) | |
| tree | 4528851a9b04282f602cebb6b2ab4bc677b63259 /drivers/ide/legacy/ide_platform.c | |
| parent | ide: make ide_unregister() take 'ide_hwif_t *' as an argument (take 2) (diff) | |
| download | kernel-qcow2-linux-4c3032d8a4d6c97bd6e02bcab524ef2428d89561.tar.gz kernel-qcow2-linux-4c3032d8a4d6c97bd6e02bcab524ef2428d89561.tar.xz kernel-qcow2-linux-4c3032d8a4d6c97bd6e02bcab524ef2428d89561.zip | |
ide: add struct ide_io_ports (take 3)
* Add struct ide_io_ports and use it instead of `unsigned long io_ports[]`
in ide_hwif_t.
* Rename io_ports[] in hw_regs_t to io_ports_array[].
* Use un-named union for 'unsigned long io_ports_array[]' and 'struct
ide_io_ports io_ports' in hw_regs_t.
* Remove IDE_*_OFFSET defines.
v2:
* scc_pata.c build fix from Stephen Rothwell.
v3:
* Fix ctl_adrr typo in Sparc-specific part of ns87415.c.
(Noticed by Andrew Morton)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/legacy/ide_platform.c')
| -rw-r--r-- | drivers/ide/legacy/ide_platform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c index ff5a1c03c92c..8279dc7ca4c0 100644 --- a/drivers/ide/legacy/ide_platform.c +++ b/drivers/ide/legacy/ide_platform.c @@ -30,14 +30,14 @@ static void __devinit plat_ide_setup_ports(hw_regs_t *hw, unsigned long port = (unsigned long)base; int i; - hw->io_ports[IDE_DATA_OFFSET] = port; + hw->io_ports.data_addr = port; port += (1 << pdata->ioport_shift); - for (i = IDE_ERROR_OFFSET; i <= IDE_STATUS_OFFSET; + for (i = 1; i <= 7; i++, port += (1 << pdata->ioport_shift)) - hw->io_ports[i] = port; + hw->io_ports_array[i] = port; - hw->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl; + hw->io_ports.ctl_addr = (unsigned long)ctrl; hw->irq = irq; |