aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-17 18:46:28 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-17 18:46:28 -0400
commite4f7f3a0994522303c006c84cb651e4caba1158e (patch)
tree4942f57e8537abcbb4b6bb8adfaf8650cb2ed676 /arch/ppc
parent3671e9a9ecb5090c38454cbf830a640f6c221ca8 (diff)
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: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/syslib/ppc4xx_setup.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/ppc/syslib/ppc4xx_setup.c b/arch/ppc/syslib/ppc4xx_setup.c
index debe14c083a..353d746b47e 100644
--- a/arch/ppc/syslib/ppc4xx_setup.c
+++ b/arch/ppc/syslib/ppc4xx_setup.c
@@ -24,7 +24,6 @@
24#include <linux/pci.h> 24#include <linux/pci.h>
25#include <linux/rtc.h> 25#include <linux/rtc.h>
26#include <linux/console.h> 26#include <linux/console.h>
27#include <linux/ide.h>
28#include <linux/serial_reg.h> 27#include <linux/serial_reg.h>
29#include <linux/seq_file.h> 28#include <linux/seq_file.h>
30 29
@@ -189,24 +188,6 @@ ppc4xx_calibrate_decr(void)
189 mtspr(SPRN_PIT, tb_ticks_per_jiffy); 188 mtspr(SPRN_PIT, tb_ticks_per_jiffy);
190} 189}
191 190
192/*
193 * IDE stuff.
194 * should be generic for every IDE PCI chipset
195 */
196#if defined(CONFIG_PCI) && defined(CONFIG_IDE)
197static void
198ppc4xx_ide_init_hwif_ports(hw_regs_t * hw, unsigned long data_port,
199 unsigned long ctrl_port, int *irq)
200{
201 int i;
202
203 for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; ++i)
204 hw->io_ports[i] = data_port + i - IDE_DATA_OFFSET;
205
206 hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
207}
208#endif /* defined(CONFIG_PCI) && defined(CONFIG_IDE) */
209
210TODC_ALLOC(); 191TODC_ALLOC();
211 192
212/* 193/*
@@ -271,10 +252,6 @@ ppc4xx_init(unsigned long r3, unsigned long r4, unsigned long r5,
271#ifdef CONFIG_SERIAL_TEXT_DEBUG 252#ifdef CONFIG_SERIAL_TEXT_DEBUG
272 ppc_md.progress = gen550_progress; 253 ppc_md.progress = gen550_progress;
273#endif 254#endif
274
275#if defined(CONFIG_PCI) && defined(CONFIG_IDE)
276 ppc_ide_md.ide_init_hwif = ppc4xx_ide_init_hwif_ports;
277#endif /* defined(CONFIG_PCI) && defined(CONFIG_IDE) */
278} 255}
279 256
280/* Called from machine_check_exception */ 257/* Called from machine_check_exception */