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

powerpc/8xx: Remove init_internal_rtc() to fix no previous prototype error 



A W=1 build of mpc885_ads_defconfig throws the following error:

  CC      arch/powerpc/platforms/8xx/m8xx_setup.o
arch/powerpc/platforms/8xx/m8xx_setup.c:41:1: error: no previous prototype for 'init_internal_rtc' [-Werror=missing-prototypes]
   41 | init_internal_rtc(void)
      | ^~~~~~~~~~~~~~~~~

init_internal_rtc() was introduced by commit df34403d ("[POWERPC]
8xx: Add mpc885ads support and common mpc8xx files") as a weak
function but has never been defined and/or used outside m8xx_setup.c

As it is called only once there, just fold it into its caller and
remove it.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/0aa1141e18a84d926e199093204b37ec993f0c87.1692275185.git.christophe.leroy@csgroup.eu
parent eb5aa213

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

+5 −12
Original line number Diff line number Diff line
@@ -36,17 +36,6 @@ static irqreturn_t timebase_interrupt(int irq, void *dev) 
	return IRQ_HANDLED;

}



/* per-board overridable init_internal_rtc() function. */

void __init __attribute__ ((weak))

init_internal_rtc(void)

{

	/* Disable the RTC one second and alarm interrupts. */

	clrbits16(&mpc8xx_immr->im_sit.sit_rtcsc, (RTCSC_SIE | RTCSC_ALE));



	/* Enable the RTC */

	setbits16(&mpc8xx_immr->im_sit.sit_rtcsc, (RTCSC_RTF | RTCSC_RTE));

}



static int __init get_freq(char *name, unsigned long *val)

{

	struct device_node *cpu;
@@ -117,7 +106,11 @@ void __init mpc8xx_calibrate_decr(void) 
	out_be32(&mpc8xx_immr->im_sitk.sitk_rtcsck, KAPWR_KEY);

	out_be32(&mpc8xx_immr->im_sitk.sitk_tbk, KAPWR_KEY);



	init_internal_rtc();

	/* Disable the RTC one second and alarm interrupts. */

	clrbits16(&mpc8xx_immr->im_sit.sit_rtcsc, (RTCSC_SIE | RTCSC_ALE));



	/* Enable the RTC */

	setbits16(&mpc8xx_immr->im_sit.sit_rtcsc, (RTCSC_RTF | RTCSC_RTE));



	/* Enabling the decrementer also enables the timebase interrupts

	 * (or from the other point of view, to get decrementer interrupts