ide: remove ->hold field from ide_hwif_t (take 2)

->hold is write-only now, remove it.

v2:
* v1 missed bast-ide, palm_bk3710, ide-cs and delkin_cb host drivers.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

7 files changed, 4 insertions, 9 deletions

diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c
index d2196436788b..ec46c44b061c 100644
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -49,7 +49,7 @@ static int __init bastide_register(unsigned int base, unsigned int aux, int irq)
 
         if (hwif->present)
                 ide_unregister(i);
-        else if (!hwif->hold)
+        else
                 ide_init_port_data(hwif, i);
 
         ide_init_port_hw(hwif, &hw);
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c
index 73899ef4ab0d..474162cdf665 100644
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
@@ -386,7 +386,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
 
         if (hwif->present)
                 ide_unregister(i);
-        else if (!hwif->hold)
+        else
                 ide_init_port_data(hwif, i);
 
         ide_init_port_hw(hwif, &hw);
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index 2b0b4958881a..9a23b94f2939 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -164,7 +164,7 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq
 
     if (hwif->present)
         ide_unregister(i);
-    else if (!hwif->hold)
+    else
         ide_init_port_data(hwif, i);
 
     ide_init_port_hw(hwif, &hw);
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index ee76023f3737..9b628248f2f4 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -613,9 +613,6 @@ static int au_ide_probe(struct device *dev)
 
         hwif->dev = dev;
 
-        /* hold should be on in all cases */
-        hwif->hold                      = 1;
-
         hwif->mmio  = 1;
 
         /* If the user has selected DDMA assisted copies,
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index 89570df52f0a..961698d655eb 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -86,7 +86,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
 
         if (hwif->present)
                 ide_unregister(i);
-        else if (!hwif->hold)
+        else
                 ide_init_port_data(hwif, i);
 
         ide_init_port_hw(hwif, &hw);
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 7889f5f5c49a..b37dcfbdaad6 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1120,7 +1120,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw)
         hwif->hwif_data = pmif;
         ide_init_port_hw(hwif, hw);
         hwif->noprobe = pmif->mediabay;
-        hwif->hold = pmif->mediabay;
         hwif->cbl = pmif->cable_80 ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
         hwif->set_pio_mode = pmac_ide_set_pio_mode;
         if (pmif->kind == controller_un_ata6
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 478ddf7e21d5..7744ac9d1ff9 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -571,7 +571,6 @@ typedef struct hwif_s {
 
         unsigned        noprobe    : 1; /* don't probe for this interface */
         unsigned        present    : 1; /* this interface exists */
-        unsigned        hold       : 1; /* this interface is always present */
         unsigned        serialized : 1; /* serialized all channel operation */
         unsigned        sharing_irq: 1; /* 1 = sharing irq with another hwif */
         unsigned        reset      : 1; /* reset after probe */