Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+2 -40
+2 -40
arch/blackfin/mach-common/ints-priority.c
··· 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 } ··· 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: ··· 880 884 881 885 bfin_internal_set_wake(pint_irq, state); 882 886 883 - if (state) 884 - pint_wakeup_masks[bank] |= pintbit; 885 - else 886 - pint_wakeup_masks[bank] &= ~pintbit; 887 - 888 887 return 0; 889 - } 890 - 891 - u32 bfin_pm_setup(void) 892 - { 893 - u32 val, i; 894 - 895 - for (i = 0; i < NR_PINT_SYS_IRQS; i++) { 896 - val = pint[i]->mask_clear; 897 - pint_saved_masks[i] = val; 898 - if (val ^ pint_wakeup_masks[i]) { 899 - pint[i]->mask_clear = val; 900 - pint[i]->mask_set = pint_wakeup_masks[i]; 901 - } 902 - } 903 - 904 - return 0; 905 - } 906 - 907 - void bfin_pm_restore(void) 908 - { 909 - u32 i, val; 910 - 911 - for (i = 0; i < NR_PINT_SYS_IRQS; i++) { 912 - val = pint_saved_masks[i]; 913 - if (val ^ pint_wakeup_masks[i]) { 914 - pint[i]->mask_clear = pint[i]->mask_clear; 915 - pint[i]->mask_set = val; 916 - } 917 - } 918 888 } 919 889 #else 920 890 # define bfin_gpio_set_wake NULL