Commit 2304dc64 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 93de00fd
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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,
......
......@@ -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);
......
......@@ -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
......
......@@ -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 */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment