Skip to content

Commit

Permalink
ARM: pxa: remove duplicated registeration on pxa-gpio
Browse files Browse the repository at this point in the history
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: Paul Parsons <lost.distance@yahoo.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
  • Loading branch information
Haojian Zhuang committed Mar 6, 2012
1 parent bbdc818 commit 0c7de34
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 5 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-pxa/generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-pxa/pxa25x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-pxa/pxa27x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-pxa/pxa3xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-pxa/pxa95x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 0c7de34

Please sign in to comment.