diff options
| author | Bartlomiej Zolnierkiewicz | 2008-07-23 19:55:50 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2008-07-23 19:55:50 +0200 |
| commit | c97c6aca75fd5f718056fde7cff798b8cbdb07c0 (patch) | |
| tree | 275635f3afb9d3a1f1f9ea5cebe08b5f327fc92c /drivers/ide/legacy/ide_platform.c | |
| parent | ide: move ide_pci_setup_ports() call out from do_ide_setup_pci_device() (diff) | |
| download | kernel-qcow2-linux-c97c6aca75fd5f718056fde7cff798b8cbdb07c0.tar.gz kernel-qcow2-linux-c97c6aca75fd5f718056fde7cff798b8cbdb07c0.tar.xz kernel-qcow2-linux-c97c6aca75fd5f718056fde7cff798b8cbdb07c0.zip | |
ide: pass hw_regs_t-s to ide_device_add[_all]() (take 3)
* Add 'hw_regs_t **hws' argument to ide_device_add[_all]() and convert
host drivers + ide_legacy_init_one() + ide_setup_pci_device[s]() to use
it instead of calling ide_init_port_hw() directly.
[ However if host has > 1 port we must still set hwif->chipset to hint
consecutive ide_find_port() call that the previous slot is occupied. ]
* Unexport ide_init_port_hw().
v2:
* Use defines instead of hard-coded values in buddha.c, gayle.c and q40ide.c.
(Suggested by Geert Uytterhoeven)
* Better patch description.
v3:
* Fix build problem in ide-cs.c. (Noticed by Stephen Rothwell)
There should be no functional changes caused by this patch.
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
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 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c index a249562b34b5..609da0d43196 100644 --- a/drivers/ide/legacy/ide_platform.c +++ b/drivers/ide/legacy/ide_platform.c @@ -54,10 +54,9 @@ static int __devinit plat_ide_probe(struct platform_device *pdev) void __iomem *base, *alt_base; ide_hwif_t *hwif; struct pata_platform_info *pdata; + int ret = 0, mmio = 0; + hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; - int ret = 0; - int mmio = 0; - hw_regs_t hw; struct ide_port_info d = platform_ide_port_info; pdata = pdev->dev.platform_data; @@ -104,8 +103,6 @@ static int __devinit plat_ide_probe(struct platform_device *pdev) plat_ide_setup_ports(&hw, base, alt_base, pdata, res_irq->start); hw.dev = &pdev->dev; - ide_init_port_hw(hwif, &hw); - if (mmio) { d.host_flags |= IDE_HFLAG_MMIO; default_hwif_mmiops(hwif); @@ -113,7 +110,7 @@ static int __devinit plat_ide_probe(struct platform_device *pdev) idx[0] = hwif->index; - ide_device_add(idx, &d); + ide_device_add(idx, &d, hws); platform_set_drvdata(pdev, hwif); |