ide: remove ->hold field from ide_hwif_t (take 2)
PATCH 1/1 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.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/ide/arm/bast-ide.c | 2 +- drivers/ide/arm/palm_bk3710.c | 2 +- drivers/ide/legacy/ide-cs.c | 2 +- drivers/ide/mips/au1xxx-ide.c | 3 --- drivers/ide/pci/delkin_cb.c | 2 +- drivers/ide/ppc/pmac.c | 1 - include/linux/ide.h | 1 - 7 files changed, 4 insertions(+), 9 deletions(-)
drivers/ide/arm/bast-ide.c +1 -1
@@ -54,7 +54,7 @@ bastide_register(unsigned int base, unsiif (hwif->present)ide_unregister (i); -else if (!hwif->hold) +else ide_init_port_data (hwif, i);ide_init_port_hw (hwif, &hw);
drivers/ide/arm/palm_bk3710.c +1 -1
@@ -386,7 +386,7 @@ static int __devinit palm_bk3710_probe(sif (hwif->present)ide_unregister (i,0 ,0 ); -else if (!hwif->hold) +else ide_init_port_data (hwif, i);ide_init_port_hw (hwif, &hw);
drivers/ide/legacy/ide-cs.c +1 -1
@@ -164,7 +164,7 @@ static int idecs_register(unsigned longif (hwif->present)ide_unregister (i); -else if (!hwif->hold) +else ide_init_port_data (hwif, i);ide_init_port_hw (hwif, &hw);
drivers/ide/mips/au1xxx-ide.c +0 -3
@@ -617,9 +617,6 @@ static int au_ide_probe(struct device *d hwif->dev = dev; -/* hold should be on in all cases */ - hwif->hold =1 ; - hwif->mmio =1 ;/* If the user has selected DDMA assisted copies,
drivers/ide/pci/delkin_cb.c +1 -1
@@ -86,7 +86,7 @@ delkin_cb_probe (struct pci_dev *dev, coif (hwif->present)ide_unregister (i); -else if (!hwif->hold) +else ide_init_port_data (hwif, i);ide_init_port_hw (hwif, &hw);
drivers/ide/ppc/pmac.c +0 -1
@@ -1120,7 +1120,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *p 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
include/linux/ide.h +0 -1
@@ -573,7 +573,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 */
Quoted 4 lines · Bartlomiej Zolnierkiewicz
->hold is write-only now, remove it.
v2:
* v1 missed bast-ide,palm_bk3710, ide-cs anddelkin_cbhost drivers.
And those drivers were reading it, so it wasn't quite write-only. :-)
Quoted 1 line
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Acked-by Sergei Shtylyov <[email protected]>
MBR, Sergei