Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2304dc64 authored Apr 18, 2008 by Bartlomiej Zolnierkiewicz

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>

parent 93de00fd

drivers/ide/arm/bast-ide.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/ide/arm/palm_bk3710.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/ide/legacy/ide-cs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/ide/mips/au1xxx-ide.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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,

drivers/ide/pci/delkin_cb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);