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

Commit 4f0eee4d authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: use ide_find_port() instead of ide_deprecated_find_port() 



* Use ide_find_port() instead of ide_deprecated_find_port() in bast-ide/
  palm_bk3710/ide-cs/delkin_cb host drivers and in ide_register_hw().

* Remove no longer needed ide_deprecated_find_port().

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 2625cd52

drivers/ide/arm/bast-ide.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static int __init bastide_register(unsigned int base, unsigned int aux, int irq) 
	hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);

	hw.irq = irq;



	hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	if (hwif == NULL)

		goto out;

drivers/ide/arm/palm_bk3710.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) 
	hw.irq = irq->start;

	hw.chipset = ide_palm3710;



	hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	if (hwif == NULL)

		goto out;

drivers/ide/ide.c

+1 −26
Original line number Diff line number Diff line
@@ -618,31 +618,6 @@ void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw) 
}

EXPORT_SYMBOL_GPL(ide_init_port_hw);



ide_hwif_t *ide_deprecated_find_port(unsigned long base)

{

	ide_hwif_t *hwif;

	int i;



	for (i = 0; i < MAX_HWIFS; i++) {

		hwif = &ide_hwifs[i];

		if (hwif->io_ports[IDE_DATA_OFFSET] == base)

			goto found;

	}



	for (i = 0; i < MAX_HWIFS; i++) {

		hwif = &ide_hwifs[i];

		if (hwif->hold)

			continue;

		if (!hwif->present && hwif->mate == NULL)

			goto found;

	}



	hwif = NULL;

found:

	return hwif;

}

EXPORT_SYMBOL_GPL(ide_deprecated_find_port);



/**

 *	ide_register_hw		-	register IDE interface

 *	@hw: hardware registers
@@ -662,7 +637,7 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *), 
	u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };



	do {

		hwif = ide_deprecated_find_port(hw->io_ports[IDE_DATA_OFFSET]);

		hwif = ide_find_port(hw->io_ports[IDE_DATA_OFFSET]);

		if (hwif)

			goto found;

		for (index = 0; index < MAX_HWIFS; index++)

drivers/ide/legacy/ide-cs.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq 
    hw.chipset = ide_pci;

    hw.dev = &handle->dev;



    hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);

    hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);

    if (hwif == NULL)

	return -1;

drivers/ide/pci/delkin_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) 
	hw.irq = dev->irq;

	hw.chipset = ide_pci;		/* this enables IRQ sharing */



	hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	if (hwif == NULL)

		goto out_disable;