Commit e3ba31b7 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/8xx: Remove mpc8xx_pics_init() 



mpc8xx_pics_init() is now only a trampoline to
mpc8xx_pic_init().

Remove mpc8xx_pics_init() and use mpc8xx_pic_init()
directly.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/9c55a698adb5ba3b7b77023170fcaf0acb5d2d81.1649226186.git.christophe.leroy@csgroup.eu
parent 14d893fc

arch/powerpc/platforms/8xx/adder875.c

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <asm/udbg.h>



#include "mpc8xx.h"

#include "pic.h"



struct cpm_pin {

	int port, pin, flags;
@@ -103,7 +104,7 @@ define_machine(adder875) { 
	.name = "Adder MPC875",

	.probe = adder875_probe,

	.setup_arch = adder875_setup,

	.init_IRQ = mpc8xx_pics_init,

	.init_IRQ = mpc8xx_pic_init,

	.get_irq = mpc8xx_get_irq,

	.restart = mpc8xx_restart,

	.calibrate_decr = generic_calibrate_decr,

arch/powerpc/platforms/8xx/ep88xc.c

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <asm/cpm1.h>



#include "mpc8xx.h"

#include "pic.h"



struct cpm_pin {

	int port, pin, flags;
@@ -166,7 +167,7 @@ define_machine(ep88xc) { 
	.name = "Embedded Planet EP88xC",

	.probe = ep88xc_probe,

	.setup_arch = ep88xc_setup_arch,

	.init_IRQ = mpc8xx_pics_init,

	.init_IRQ = mpc8xx_pic_init,

	.get_irq	= mpc8xx_get_irq,

	.restart = mpc8xx_restart,

	.calibrate_decr = mpc8xx_calibrate_decr,

arch/powerpc/platforms/8xx/m8xx_setup.c

+0 −14
Original line number Diff line number Diff line
@@ -205,17 +205,3 @@ void __noreturn mpc8xx_restart(char *cmd) 
	in_8(&clk_r->res[0]);

	panic("Restart failed\n");

}
 


/* Initialize the internal interrupt controllers.  The number of

 * interrupts supported can vary with the processor type, and the

 * 82xx family can have up to 64.

 * External interrupts can be either edge or level triggered, and

 * need to be initialized by the appropriate driver.

 */

void __init mpc8xx_pics_init(void)

{

	if (mpc8xx_pic_init()) {

		printk(KERN_ERR "Failed interrupt 8xx controller  initialization\n");

		return;

	}

}

arch/powerpc/platforms/8xx/mpc86xads_setup.c

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include "mpc86xads.h"

#include "mpc8xx.h"

#include "pic.h"



struct cpm_pin {

	int port, pin, flags;
@@ -140,7 +141,7 @@ define_machine(mpc86x_ads) { 
	.name			= "MPC86x ADS",

	.probe			= mpc86xads_probe,

	.setup_arch		= mpc86xads_setup_arch,

	.init_IRQ		= mpc8xx_pics_init,

	.init_IRQ		= mpc8xx_pic_init,

	.get_irq		= mpc8xx_get_irq,

	.restart		= mpc8xx_restart,

	.calibrate_decr		= mpc8xx_calibrate_decr,

arch/powerpc/platforms/8xx/mpc885ads_setup.c

+2 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


#include "mpc885ads.h"

#include "mpc8xx.h"

#include "pic.h"



static u32 __iomem *bcsr, *bcsr5;
@@ -216,7 +217,7 @@ define_machine(mpc885_ads) { 
	.name			= "Freescale MPC885 ADS",

	.probe			= mpc885ads_probe,

	.setup_arch		= mpc885ads_setup_arch,

	.init_IRQ		= mpc8xx_pics_init,

	.init_IRQ		= mpc8xx_pic_init,

	.get_irq		= mpc8xx_get_irq,

	.restart		= mpc8xx_restart,

	.calibrate_decr		= mpc8xx_calibrate_decr,