ide: remove ->noprobe field from ide_hwif_t

Update IDE PMAC host driver to use drive->noprobe instead of hwif->noprobe
and remove hwif->noprobe completely (it is always set to zero now).

There should be no functional changes caused by this patch.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 3277bf2d66a5..4e0583907413 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1049,17 +1049,22 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw)
         hwif->mmio = 1;
         hwif->hwif_data = pmif;
         ide_init_port_hw(hwif, hw);
-        hwif->noprobe = pmif->mediabay;
         hwif->cbl = pmif->cable_80 ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
 
         printk(KERN_INFO "ide%d: Found Apple %s controller, bus ID %d%s, irq %d\n",
                hwif->index, model_name[pmif->kind], pmif->aapl_bus_id,
                pmif->mediabay ? " (mediabay)" : "", hwif->irq);
-                        
+
+        if (pmif->mediabay) {
 #ifdef CONFIG_PMAC_MEDIABAY
-        if (pmif->mediabay && check_media_bay_by_base(pmif->regbase, MB_CD) == 0)
-                hwif->noprobe = 0;
-#endif /* CONFIG_PMAC_MEDIABAY */
+                if (check_media_bay_by_base(pmif->regbase, MB_CD)) {
+#else
+                if (1) {
+#endif
+                        hwif->drives[0].noprobe = 1;
+                        hwif->drives[1].noprobe = 1;
+                }
+        }
 
 #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
         if (pmif->cable_80 == 0)