Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0a02a06 authored Jan 24, 2008 by Jochen Friedrich Committed by Kumar Gala Jan 28, 2008

[POWERPC] 8xx: Rename m8xx_pic_init to mpc8xx_pics_init



m8xx_pic_init calls both mpc8xx_pic_init and cpm_pic_init. Renaming the
function to use the same name space as the rest of the mpc8xx
specific funtions and to be more meaningful.

m8xx_pic_init is declared in ppc8xx_pic.h but defined nowhere in the ppc
tree. Remove it.

Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

parent 22f19daf

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -165,7 +165,7 @@ define_machine(ep88xc) {
	.name = "Embedded Planet EP88xC",		.name = "Embedded Planet EP88xC",
	.probe = ep88xc_probe,		.probe = ep88xc_probe,
	.setup_arch = ep88xc_setup_arch,		.setup_arch = ep88xc_setup_arch,
	.init_IRQ = m8xx_pic_init,		.init_IRQ = mpc8xx_pics_init,
	.get_irq = mpc8xx_get_irq,		.get_irq = mpc8xx_get_irq,
	.restart = mpc8xx_restart,		.restart = mpc8xx_restart,
	.calibrate_decr = mpc8xx_calibrate_decr,		.calibrate_decr = mpc8xx_calibrate_decr,

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -237,13 +237,13 @@ static void cpm_cascade(unsigned int irq, struct irq_desc *desc)
	desc->chip->eoi(irq);		desc->chip->eoi(irq);
	}		}

	/* Initialize the internal interrupt controller. The number of		/* Initialize the internal interrupt controllers. The number of
	* interrupts supported can vary with the processor type, and the		* interrupts supported can vary with the processor type, and the
	* 82xx family can have up to 64.		* 82xx family can have up to 64.
	* External interrupts can be either edge or level triggered, and		* External interrupts can be either edge or level triggered, and
	* need to be initialized by the appropriate driver.		* need to be initialized by the appropriate driver.
	*/		*/
	void __init m8xx_pic_init(void)		void __init mpc8xx_pics_init(void)
	{		{
	int irq;		int irq;

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -138,7 +138,7 @@ define_machine(mpc86x_ads) {
	.name = "MPC86x ADS",		.name = "MPC86x ADS",
	.probe = mpc86xads_probe,		.probe = mpc86xads_probe,
	.setup_arch = mpc86xads_setup_arch,		.setup_arch = mpc86xads_setup_arch,
	.init_IRQ = m8xx_pic_init,		.init_IRQ = mpc8xx_pics_init,
	.get_irq = mpc8xx_get_irq,		.get_irq = mpc8xx_get_irq,
	.restart = mpc8xx_restart,		.restart = mpc8xx_restart,
	.calibrate_decr = mpc8xx_calibrate_decr,		.calibrate_decr = mpc8xx_calibrate_decr,

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -274,7 +274,7 @@ define_machine(mpc885_ads) {
	.name = "Freescale MPC885 ADS",		.name = "Freescale MPC885 ADS",
	.probe = mpc885ads_probe,		.probe = mpc885ads_probe,
	.setup_arch = mpc885ads_setup_arch,		.setup_arch = mpc885ads_setup_arch,
	.init_IRQ = m8xx_pic_init,		.init_IRQ = mpc8xx_pics_init,
	.get_irq = mpc8xx_get_irq,		.get_irq = mpc8xx_get_irq,
	.restart = mpc8xx_restart,		.restart = mpc8xx_restart,
	.calibrate_decr = mpc8xx_calibrate_decr,		.calibrate_decr = mpc8xx_calibrate_decr,

arch/powerpc/sysdev/commproc.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@ extern void mpc8xx_restart(char *cmd);
	extern void mpc8xx_calibrate_decr(void);		extern void mpc8xx_calibrate_decr(void);
	extern int mpc8xx_set_rtc_time(struct rtc_time *tm);		extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
	extern void mpc8xx_get_rtc_time(struct rtc_time *tm);		extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
	extern void m8xx_pic_init(void);		extern void mpc8xx_pics_init(void);
	extern unsigned int mpc8xx_get_irq(void);		extern unsigned int mpc8xx_get_irq(void);

	#endif		#endif