Commit 5d682e44 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ppc/pplus: remove ppc_ide_md.ide_init_hwif hook 



* Call ide_init_default_irq() for pplus in init_ide_data().

* Remove no longer needed pplus_ide_init_hwif_ports().

There should be no functional changes caused by this patch.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 7ef8df81

arch/ppc/platforms/pplus.c

+0 −23
Original line number Diff line number Diff line
@@ -695,28 +695,6 @@ static unsigned long pplus_ide_default_io_base(int index) 
		return 0;

	}

}



static void __init

pplus_ide_init_hwif_ports(hw_regs_t * hw, unsigned long data_port,

			  unsigned long ctrl_port, int *irq)

{

	unsigned long reg = data_port;

	int i;



	for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {

		hw->io_ports[i] = reg;

		reg += 1;

	}



	if (ctrl_port)

		hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;

	else

		hw->io_ports[IDE_CONTROL_OFFSET] =

		    hw->io_ports[IDE_DATA_OFFSET] + 0x206;



	if (irq != NULL)

		*irq = pplus_ide_default_irq(data_port);

}

#endif



#ifdef CONFIG_SMP
@@ -887,7 +865,6 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 
#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)

	ppc_ide_md.default_irq = pplus_ide_default_irq;

	ppc_ide_md.default_io_base = pplus_ide_default_io_base;

	ppc_ide_md.ide_init_hwif = pplus_ide_init_hwif_ports;

#endif



#ifdef CONFIG_SERIAL_TEXT_DEBUG

drivers/ide/ide.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static void __init init_ide_data (void) 
		memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports));

#endif

		hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];

#if !defined(CONFIG_PPC32) || !defined(CONFIG_PCI)

#if !defined(CONFIG_PPC32) || defined(CONFIG_PPLUS) || !defined(CONFIG_PCI)

		hwif->irq =

			ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE