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

blackfin: portmux: cleanup head file

drop unused head file
change pinmux request/free macro for backward compatiblity
add function declaration

Signed-off-by: Steven Miao <realmz6@gmail.com>

+4 -6
+4 -6
arch/blackfin/include/asm/portmux.h
··· 18 18 #define P_DONTCARE 0x1000 19 19 20 20 #ifdef CONFIG_PINCTRL 21 - #include <asm/irq_handler.h> 21 + int bfin_internal_set_wake(unsigned int irq, unsigned int state); 22 22 23 23 #define gpio_pint_regs bfin_pint_regs 24 24 #define adi_internal_set_wake bfin_internal_set_wake 25 25 26 - #define peripheral_request(per, label) 0 26 + #define peripheral_request(per, label) (0) 27 27 #define peripheral_free(per) 28 - #define peripheral_request_list(per, label) \ 29 - (pdev ? (IS_ERR(devm_pinctrl_get_select_default(&pdev->dev)) \ 30 - ? -EINVAL : 0) : 0) 28 + #define peripheral_request_list(per, label) (0) 31 29 #define peripheral_free_list(per) 32 30 #else 33 31 int peripheral_request(unsigned short per, const char *label); ··· 37 39 #include <linux/err.h> 38 40 #include <linux/pinctrl/pinctrl.h> 39 41 #include <mach/portmux.h> 40 - #include <linux/gpio.h> 42 + #include <mach/gpio.h> 41 43 42 44 #ifndef P_SPORT2_TFS 43 45 #define P_SPORT2_TFS P_UNDEF