Commit 01a2ffbd authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Li Yang

powerpc/83xx: remove mpc83xx_ipic_and_qe_init_IRQ

This is now exactly the same as mpc83xx_ipic_init_IRQ, so just use
that directly.
Acked-by: default avatarScott Wood <oss@buserror.net>
Reviewed-by: default avatarTimur Tabi <timur@kernel.org>
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarLi Yang <leoyang.li@nxp.com>
parent 4e0e161d
...@@ -177,7 +177,7 @@ define_machine(mpc83xx_km) { ...@@ -177,7 +177,7 @@ define_machine(mpc83xx_km) {
.name = "mpc83xx-km-platform", .name = "mpc83xx-km-platform",
.probe = mpc83xx_km_probe, .probe = mpc83xx_km_probe,
.setup_arch = mpc83xx_km_setup_arch, .setup_arch = mpc83xx_km_setup_arch,
.init_IRQ = mpc83xx_ipic_and_qe_init_IRQ, .init_IRQ = mpc83xx_ipic_init_IRQ,
.get_irq = ipic_get_irq, .get_irq = ipic_get_irq,
.restart = mpc83xx_restart, .restart = mpc83xx_restart,
.time_init = mpc83xx_time_init, .time_init = mpc83xx_time_init,
......
...@@ -90,13 +90,6 @@ void __init mpc83xx_ipic_init_IRQ(void) ...@@ -90,13 +90,6 @@ void __init mpc83xx_ipic_init_IRQ(void)
ipic_set_default_priority(); ipic_set_default_priority();
} }
#ifdef CONFIG_QUICC_ENGINE
void __init mpc83xx_ipic_and_qe_init_IRQ(void)
{
mpc83xx_ipic_init_IRQ();
}
#endif /* CONFIG_QUICC_ENGINE */
static const struct of_device_id of_bus_ids[] __initconst = { static const struct of_device_id of_bus_ids[] __initconst = {
{ .type = "soc", }, { .type = "soc", },
{ .compatible = "soc", }, { .compatible = "soc", },
......
...@@ -101,7 +101,7 @@ define_machine(mpc832x_mds) { ...@@ -101,7 +101,7 @@ define_machine(mpc832x_mds) {
.name = "MPC832x MDS", .name = "MPC832x MDS",
.probe = mpc832x_sys_probe, .probe = mpc832x_sys_probe,
.setup_arch = mpc832x_sys_setup_arch, .setup_arch = mpc832x_sys_setup_arch,
.init_IRQ = mpc83xx_ipic_and_qe_init_IRQ, .init_IRQ = mpc83xx_ipic_init_IRQ,
.get_irq = ipic_get_irq, .get_irq = ipic_get_irq,
.restart = mpc83xx_restart, .restart = mpc83xx_restart,
.time_init = mpc83xx_time_init, .time_init = mpc83xx_time_init,
......
...@@ -219,7 +219,7 @@ define_machine(mpc832x_rdb) { ...@@ -219,7 +219,7 @@ define_machine(mpc832x_rdb) {
.name = "MPC832x RDB", .name = "MPC832x RDB",
.probe = mpc832x_rdb_probe, .probe = mpc832x_rdb_probe,
.setup_arch = mpc832x_rdb_setup_arch, .setup_arch = mpc832x_rdb_setup_arch,
.init_IRQ = mpc83xx_ipic_and_qe_init_IRQ, .init_IRQ = mpc83xx_ipic_init_IRQ,
.get_irq = ipic_get_irq, .get_irq = ipic_get_irq,
.restart = mpc83xx_restart, .restart = mpc83xx_restart,
.time_init = mpc83xx_time_init, .time_init = mpc83xx_time_init,
......
...@@ -201,7 +201,7 @@ define_machine(mpc836x_mds) { ...@@ -201,7 +201,7 @@ define_machine(mpc836x_mds) {
.name = "MPC836x MDS", .name = "MPC836x MDS",
.probe = mpc836x_mds_probe, .probe = mpc836x_mds_probe,
.setup_arch = mpc836x_mds_setup_arch, .setup_arch = mpc836x_mds_setup_arch,
.init_IRQ = mpc83xx_ipic_and_qe_init_IRQ, .init_IRQ = mpc83xx_ipic_init_IRQ,
.get_irq = ipic_get_irq, .get_irq = ipic_get_irq,
.restart = mpc83xx_restart, .restart = mpc83xx_restart,
.time_init = mpc83xx_time_init, .time_init = mpc83xx_time_init,
......
...@@ -41,7 +41,7 @@ define_machine(mpc836x_rdk) { ...@@ -41,7 +41,7 @@ define_machine(mpc836x_rdk) {
.name = "MPC836x RDK", .name = "MPC836x RDK",
.probe = mpc836x_rdk_probe, .probe = mpc836x_rdk_probe,
.setup_arch = mpc836x_rdk_setup_arch, .setup_arch = mpc836x_rdk_setup_arch,
.init_IRQ = mpc83xx_ipic_and_qe_init_IRQ, .init_IRQ = mpc83xx_ipic_init_IRQ,
.get_irq = ipic_get_irq, .get_irq = ipic_get_irq,
.restart = mpc83xx_restart, .restart = mpc83xx_restart,
.time_init = mpc83xx_time_init, .time_init = mpc83xx_time_init,
......
...@@ -72,11 +72,6 @@ extern int mpc837x_usb_cfg(void); ...@@ -72,11 +72,6 @@ extern int mpc837x_usb_cfg(void);
extern int mpc834x_usb_cfg(void); extern int mpc834x_usb_cfg(void);
extern int mpc831x_usb_cfg(void); extern int mpc831x_usb_cfg(void);
extern void mpc83xx_ipic_init_IRQ(void); extern void mpc83xx_ipic_init_IRQ(void);
#ifdef CONFIG_QUICC_ENGINE
extern void mpc83xx_ipic_and_qe_init_IRQ(void);
#else
#define mpc83xx_ipic_and_qe_init_IRQ mpc83xx_ipic_init_IRQ
#endif /* CONFIG_QUICC_ENGINE */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
extern void mpc83xx_setup_pci(void); extern void mpc83xx_setup_pci(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment