Commit 0c7de34be3e1f0c3031f9e0c23d3d7e51db317ba

Authored by Haojian Zhuang
1 parent bbdc818b27

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: Paul Parsons <lost.distance@yahoo.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>

Showing 5 changed files with 0 additions and 5 deletions Side-by-side Diff

arch/arm/mach-pxa/generic.h
... ... @@ -49,7 +49,6 @@
49 49 #endif
50 50  
51 51 extern struct syscore_ops pxa_irq_syscore_ops;
52   -extern struct syscore_ops pxa_gpio_syscore_ops;
53 52 extern struct syscore_ops pxa2xx_mfp_syscore_ops;
54 53 extern struct syscore_ops pxa3xx_mfp_syscore_ops;
55 54  
arch/arm/mach-pxa/pxa25x.c
... ... @@ -368,7 +368,6 @@
368 368  
369 369 register_syscore_ops(&pxa_irq_syscore_ops);
370 370 register_syscore_ops(&pxa2xx_mfp_syscore_ops);
371   - register_syscore_ops(&pxa_gpio_syscore_ops);
372 371 register_syscore_ops(&pxa2xx_clock_syscore_ops);
373 372  
374 373 ret = platform_add_devices(pxa25x_devices,
arch/arm/mach-pxa/pxa27x.c
... ... @@ -456,7 +456,6 @@
456 456  
457 457 register_syscore_ops(&pxa_irq_syscore_ops);
458 458 register_syscore_ops(&pxa2xx_mfp_syscore_ops);
459   - register_syscore_ops(&pxa_gpio_syscore_ops);
460 459 register_syscore_ops(&pxa2xx_clock_syscore_ops);
461 460  
462 461 ret = platform_add_devices(devices, ARRAY_SIZE(devices));
arch/arm/mach-pxa/pxa3xx.c
... ... @@ -462,7 +462,6 @@
462 462  
463 463 register_syscore_ops(&pxa_irq_syscore_ops);
464 464 register_syscore_ops(&pxa3xx_mfp_syscore_ops);
465   - register_syscore_ops(&pxa_gpio_syscore_ops);
466 465 register_syscore_ops(&pxa3xx_clock_syscore_ops);
467 466  
468 467 ret = platform_add_devices(devices, ARRAY_SIZE(devices));
arch/arm/mach-pxa/pxa95x.c
... ... @@ -283,7 +283,6 @@
283 283 return ret;
284 284  
285 285 register_syscore_ops(&pxa_irq_syscore_ops);
286   - register_syscore_ops(&pxa_gpio_syscore_ops);
287 286 register_syscore_ops(&pxa3xx_clock_syscore_ops);
288 287  
289 288 ret = platform_add_devices(devices, ARRAY_SIZE(devices));