Commit e4f7f3a0 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ppc/ppc4xx: remove ppc_ide_md hooks 



There are no "default" IDE ports on PPC4xx so ppc4xx_ide_init_hwif_ports() is
unnecessary, remove it.  Also remove no longer needed <linux/ide.h> include.

There should be no functional changes caused by this patch.

Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 3671e9a9

arch/ppc/syslib/ppc4xx_setup.c

+0 −23
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/pci.h>

#include <linux/rtc.h>

#include <linux/console.h>

#include <linux/ide.h>

#include <linux/serial_reg.h>

#include <linux/seq_file.h>
@@ -189,24 +188,6 @@ ppc4xx_calibrate_decr(void) 
	mtspr(SPRN_PIT, tb_ticks_per_jiffy);

}



/*

 * IDE stuff.

 * should be generic for every IDE PCI chipset

 */

#if defined(CONFIG_PCI) && defined(CONFIG_IDE)

static void

ppc4xx_ide_init_hwif_ports(hw_regs_t * hw, unsigned long data_port,

			   unsigned long ctrl_port, int *irq)

{

	int i;



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

		hw->io_ports[i] = data_port + i - IDE_DATA_OFFSET;



	hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;

}

#endif /* defined(CONFIG_PCI) && defined(CONFIG_IDE) */



TODC_ALLOC();



/*
@@ -271,10 +252,6 @@ ppc4xx_init(unsigned long r3, unsigned long r4, unsigned long r5, 
#ifdef CONFIG_SERIAL_TEXT_DEBUG

	ppc_md.progress = gen550_progress;

#endif



#if defined(CONFIG_PCI) && defined(CONFIG_IDE)

	ppc_ide_md.ide_init_hwif = ppc4xx_ide_init_hwif_ports;

#endif /* defined(CONFIG_PCI) && defined(CONFIG_IDE) */

}



/* Called from machine_check_exception */

CRA Git | Maintained and supported by SUSTech CRA and CCSE