aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-17 18:46:29 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-17 18:46:29 -0400
commit2661b13a21f609b279b4048978f8625d518df6e1 (patch)
tree20cce5d8ff0f970402b33202755dde4bec41f4fb /arch/ppc
parent5c58666fae58cd69f862beaeb88d293ad00f6e37 (diff)
ppc/mpc8xx: remove ppc_ide_md hooks
* Initialize IDE ports in mpc8xx_ide_probe(). * Remove m8xx_ide_init() and ppc_ide_md hooks - no need for them (IDE mpc8xx host driver takes care of all this setup). * Remove needless 'if (irq)' and 'if (data_port >= MAX_HWIFS)' checks from m8xx_ide_init_hwif_ports(). * Remove 'ctrl_port' and 'irq' arguments from m8xx_ide_init_hwif_ports(). * Rename m8xx_ide_init_hwif_ports() to m8xx_ide_init_ports(). * Add __init tag to m8xx_ide_init_ports(). This patch fixes hwif->irq always being overriden to 0 (== auto-probe, is this even working on PPC?) because of ide_init_default_irq() call in ide.c. There should be no other functional changes. Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Vitaly Bordug <vitb@kernel.crashing.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/syslib/m8xx_setup.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c
index 9caf850c9b3..19749e9bcf9 100644
--- a/arch/ppc/syslib/m8xx_setup.c
+++ b/arch/ppc/syslib/m8xx_setup.c
@@ -87,8 +87,6 @@ void m8xx_calibrate_decr(void);
87 87
88unsigned char __res[sizeof(bd_t)]; 88unsigned char __res[sizeof(bd_t)];
89 89
90extern void m8xx_ide_init(void);
91
92extern unsigned long find_available_memory(void); 90extern unsigned long find_available_memory(void);
93extern void m8xx_cpm_reset(void); 91extern void m8xx_cpm_reset(void);
94extern void m8xx_wdt_handler_install(bd_t *bp); 92extern void m8xx_wdt_handler_install(bd_t *bp);
@@ -474,8 +472,4 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
474 472
475 ppc_md.find_end_of_memory = m8xx_find_end_of_memory; 473 ppc_md.find_end_of_memory = m8xx_find_end_of_memory;
476 ppc_md.setup_io_mappings = m8xx_map_io; 474 ppc_md.setup_io_mappings = m8xx_map_io;
477
478#if defined(CONFIG_BLK_DEV_MPC8xx_IDE)
479 m8xx_ide_init();
480#endif
481} 475}