ide-pmac: use ide_find_port()
PATCH 2/2 ide-pmac: use ide_find_port()
Cc Benjamin Herrenschmidt <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/ide/ppc/pmac.c | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-)
drivers/ide/ppc/pmac.c +19 -25
@@ -1086,38 +1086,34 @@ pmac_ide_macio_attach(struct macio_dev * {void __iomem *base;unsigned long regbase; -int irq;ide_hwif_t *hwif;pmac_ide_hwif_t *pmif; -int i, rc; +int irq, rc;hw_regs_t hw; pmif = (struct pmac_ide_hwif )kzalloc (sizeof (*pmif),GFP_KERNEL );if (pmif ==NULL )return -ENOMEM ; - i =0 ; -while (i <MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET ] !=0 )) - ++i; -if (i >=MAX_HWIFS ) { + hwif =ide_find_port (); +if (hwif ==NULL ) {printk (KERN_ERR "ide-pmac: MacIO interface attach with no slot\n" );printk (KERN_ERR " %s\n" , mdev->ofdev.node->full_name); rc = -ENODEV ; goto out_free_pmif; } - hwif = &ide_hwifs[i]; -if (macio_resource_count (mdev) ==0 ) { -printk (KERN_WARNING "ide%d: no address for %s\n" , - i, mdev->ofdev.node->full_name); +printk (KERN_WARNING "ide-pmac: no address for %s\n" , + mdev->ofdev.node->full_name); rc = -ENXIO ; goto out_free_pmif; }/* Request memory resource for IO ports */ if (macio_request_resource (mdev,0 ,"ide-pmac (ports)" )) { -printk (KERN_ERR "ide%d: can't request mmio resource !\n" , i); +printk (KERN_ERR "ide-pmac: can't request MMIO resource for " +"%s!\n" , mdev->ofdev.node->full_name); rc = -EBUSY ; goto out_free_pmif; }
@@ -1128,8 +1124,8 @@ pmac_ide_macio_attach(struct macio_dev ** where that happens though... */ if (macio_irq_count (mdev) ==0 ) { -printk (KERN_WARNING "ide%d: no intrs for device %s, using 13\n" , - i, mdev->ofdev.node->full_name); +printk (KERN_WARNING "ide-pmac: no intrs for device %s, using " +"13\n" , mdev->ofdev.node->full_name); irq =irq_create_mapping (NULL ,13 ); }else irq =macio_irq (mdev,0 );
@@ -1147,7 +1143,9 @@ pmac_ide_macio_attach(struct macio_dev *#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC if (macio_resource_count (mdev) >=2 ) {if (macio_request_resource (mdev,1 ,"ide-pmac (dma)" )) -printk (KERN_WARNING "ide%d: can't request DMA resource !\n" , i); +printk (KERN_WARNING "ide-pmac: can't request DMA " +"resource for %s!\n" , + mdev->ofdev.node->full_name);else pmif->dma_regs =ioremap (macio_resource_start (mdev,1 ),0x1000 ); }else
@@ -1222,7 +1220,7 @@ pmac_ide_pci_attach(struct pci_dev *pdevpmac_ide_hwif_t *pmif;void __iomem *base;unsigned long rbase, rlen; -int i, rc; +int rc;hw_regs_t hw; np =pci_device_to_OF_node (pdev);
@@ -1235,29 +1233,25 @@ pmac_ide_pci_attach(struct pci_dev *pdevif (pmif ==NULL )return -ENOMEM ; - i =0 ; -while (i <MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET ] !=0 )) - ++i; -if (i >=MAX_HWIFS ) { + hwif =ide_find_port (); +if (hwif ==NULL ) {printk (KERN_ERR "ide-pmac: PCI interface attach with no slot\n" );printk (KERN_ERR " %s\n" , np->full_name); rc = -ENODEV ; goto out_free_pmif; } - hwif = &ide_hwifs[i]; -if (pci_enable_device (pdev)) { -printk (KERN_WARNING "ide%i: Can't enable PCI device for %s\n" , - i, np->full_name); +printk (KERN_WARNING "ide-pmac: Can't enable PCI device for " +"%s\n" , np->full_name); rc = -ENXIO ; goto out_free_pmif; }pci_set_master (pdev);if (pci_request_regions (pdev,"Kauai ATA" )) { -printk (KERN_ERR "ide%d: Cannot obtain PCI resources for %s\n" , - i, np->full_name); +printk (KERN_ERR "ide-pmac: Cannot obtain PCI resources for " +"%s\n" , np->full_name); rc = -ENXIO ; goto out_free_pmif; }