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

Commit 0c7de34b authored by Haojian Zhuang's avatar Haojian Zhuang
Browse files

ARM: pxa: remove duplicated registeration on pxa-gpio 



Both reboot (via reboot(RB_AUTOBOOT)) and suspend freeze on hx4700.

Registration of pxa_gpio_syscore_ops is moved into pxa-gpio driver,
but it still exists in arch-pxa directory. It resulsts failure on
reboot and suspend.

Now remove the registration code in arch-pxa.

Reported-by: default avatarPaul Parsons <lost.distance@yahoo.com>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
parent bbdc818b

arch/arm/mach-pxa/generic.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ extern unsigned pxa3xx_get_clk_frequency_khz(int); 
#endif



extern struct syscore_ops pxa_irq_syscore_ops;

extern struct syscore_ops pxa_gpio_syscore_ops;

extern struct syscore_ops pxa2xx_mfp_syscore_ops;

extern struct syscore_ops pxa3xx_mfp_syscore_ops;

arch/arm/mach-pxa/pxa25x.c

+0 −1
Original line number Diff line number Diff line
@@ -368,7 +368,6 @@ static int __init pxa25x_init(void) 


		register_syscore_ops(&pxa_irq_syscore_ops);

		register_syscore_ops(&pxa2xx_mfp_syscore_ops);

		register_syscore_ops(&pxa_gpio_syscore_ops);

		register_syscore_ops(&pxa2xx_clock_syscore_ops);



		ret = platform_add_devices(pxa25x_devices,

arch/arm/mach-pxa/pxa27x.c

+0 −1
Original line number Diff line number Diff line
@@ -456,7 +456,6 @@ static int __init pxa27x_init(void) 


		register_syscore_ops(&pxa_irq_syscore_ops);

		register_syscore_ops(&pxa2xx_mfp_syscore_ops);

		register_syscore_ops(&pxa_gpio_syscore_ops);

		register_syscore_ops(&pxa2xx_clock_syscore_ops);



		ret = platform_add_devices(devices, ARRAY_SIZE(devices));

arch/arm/mach-pxa/pxa3xx.c

+0 −1
Original line number Diff line number Diff line
@@ -462,7 +462,6 @@ static int __init pxa3xx_init(void) 


		register_syscore_ops(&pxa_irq_syscore_ops);

		register_syscore_ops(&pxa3xx_mfp_syscore_ops);

		register_syscore_ops(&pxa_gpio_syscore_ops);

		register_syscore_ops(&pxa3xx_clock_syscore_ops);



		ret = platform_add_devices(devices, ARRAY_SIZE(devices));

arch/arm/mach-pxa/pxa95x.c

+0 −1
Original line number Diff line number Diff line
@@ -283,7 +283,6 @@ static int __init pxa95x_init(void) 
			return ret;



		register_syscore_ops(&pxa_irq_syscore_ops);

		register_syscore_ops(&pxa_gpio_syscore_ops);

		register_syscore_ops(&pxa3xx_clock_syscore_ops);



		ret = platform_add_devices(devices, ARRAY_SIZE(devices));