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

Commit 438d7dc2 authored by Haojian Zhuang's avatar Haojian Zhuang
Browse files

ARM: pxa: fix mixed declarations and code in sharpsl_pm 



arch/arm/mach-pxa/sharpsl_pm.c: In function
'sharpsl_pm_pxa_read_max1111':
arch/arm/mach-pxa/sharpsl_pm.c:180: warning: ISO C90 forbids mixed
declarations and code

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
parent bc329ad7

arch/arm/mach-pxa/sharpsl_pm.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -168,6 +168,7 @@ struct battery_thresh sharpsl_battery_levels_noac[] = { 
#define MAXCTRL_SEL_SH   4

#define MAXCTRL_SEL_SH   4

#define MAXCTRL_STR      (1u << 7)

#define MAXCTRL_STR      (1u << 7)





extern int max1111_read_channel(int);

/*

/*

 * Read MAX1111 ADC

 * Read MAX1111 ADC

 */

 */
@@ -177,8 +178,6 @@ int sharpsl_pm_pxa_read_max1111(int channel) 
	if (machine_is_tosa())

	if (machine_is_tosa())

	    return 0;

	    return 0;





	extern int max1111_read_channel(int);



	/* max1111 accepts channels from 0-3, however,

	/* max1111 accepts channels from 0-3, however,

	 * it is encoded from 0-7 here in the code.

	 * it is encoded from 0-7 here in the code.

	 */

	 */