Commit dd8cb37b4e92c487fd10e7da96bab18d33de62da
1 parent
f58c3276d3
Exists in
master
and in
7 other branches
Blackfin: bf54x: drop unused pm gpio handling
This functionality was merged into the common bfin_pm_standby_ctrl func some time ago, so punt these now unused funcs and data, and localize the wake funcs that aren't needed externally anymore. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Showing 1 changed file with 2 additions and 40 deletions Side-by-side Diff
arch/blackfin/mach-common/ints-priority.c
| ... | ... | @@ -559,7 +559,7 @@ |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | 561 | #ifdef CONFIG_PM |
| 562 | -int bfin_gpio_set_wake(struct irq_data *d, unsigned int state) | |
| 562 | +static int bfin_gpio_set_wake(struct irq_data *d, unsigned int state) | |
| 563 | 563 | { |
| 564 | 564 | return gpio_pm_wakeup_ctrl(irq_to_gpio(d->irq), state); |
| 565 | 565 | } |
| 566 | 566 | |
| ... | ... | @@ -855,15 +855,11 @@ |
| 855 | 855 | } |
| 856 | 856 | |
| 857 | 857 | #ifdef CONFIG_PM |
| 858 | -u32 pint_saved_masks[NR_PINT_SYS_IRQS]; | |
| 859 | -u32 pint_wakeup_masks[NR_PINT_SYS_IRQS]; | |
| 860 | - | |
| 861 | -int bfin_gpio_set_wake(struct irq_data *d, unsigned int state) | |
| 858 | +static int bfin_gpio_set_wake(struct irq_data *d, unsigned int state) | |
| 862 | 859 | { |
| 863 | 860 | u32 pint_irq; |
| 864 | 861 | u32 pint_val = irq2pint_lut[d->irq - SYS_IRQS]; |
| 865 | 862 | u32 bank = PINT_2_BANK(pint_val); |
| 866 | - u32 pintbit = PINT_BIT(pint_val); | |
| 867 | 863 | |
| 868 | 864 | switch (bank) { |
| 869 | 865 | case 0: |
| 870 | 866 | |
| ... | ... | @@ -884,41 +880,7 @@ |
| 884 | 880 | |
| 885 | 881 | bfin_internal_set_wake(pint_irq, state); |
| 886 | 882 | |
| 887 | - if (state) | |
| 888 | - pint_wakeup_masks[bank] |= pintbit; | |
| 889 | - else | |
| 890 | - pint_wakeup_masks[bank] &= ~pintbit; | |
| 891 | - | |
| 892 | 883 | return 0; |
| 893 | -} | |
| 894 | - | |
| 895 | -u32 bfin_pm_setup(void) | |
| 896 | -{ | |
| 897 | - u32 val, i; | |
| 898 | - | |
| 899 | - for (i = 0; i < NR_PINT_SYS_IRQS; i++) { | |
| 900 | - val = pint[i]->mask_clear; | |
| 901 | - pint_saved_masks[i] = val; | |
| 902 | - if (val ^ pint_wakeup_masks[i]) { | |
| 903 | - pint[i]->mask_clear = val; | |
| 904 | - pint[i]->mask_set = pint_wakeup_masks[i]; | |
| 905 | - } | |
| 906 | - } | |
| 907 | - | |
| 908 | - return 0; | |
| 909 | -} | |
| 910 | - | |
| 911 | -void bfin_pm_restore(void) | |
| 912 | -{ | |
| 913 | - u32 i, val; | |
| 914 | - | |
| 915 | - for (i = 0; i < NR_PINT_SYS_IRQS; i++) { | |
| 916 | - val = pint_saved_masks[i]; | |
| 917 | - if (val ^ pint_wakeup_masks[i]) { | |
| 918 | - pint[i]->mask_clear = pint[i]->mask_clear; | |
| 919 | - pint[i]->mask_set = val; | |
| 920 | - } | |
| 921 | - } | |
| 922 | 884 | } |
| 923 | 885 | #else |
| 924 | 886 | # define bfin_gpio_set_wake NULL |