On Fri, Feb 06, 2015 at 05:41:39PM +0800, Sonic Zhang wrote:
> From: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
>
> Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
I do not think arch changes shoudl go through my tree though...
> ---
> arch/blackfin/include/asm/portmux.h | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/arch/blackfin/include/asm/portmux.h b/arch/blackfin/include/asm/portmux.h
> index ccb96ca..2f6893e 100644
> --- a/arch/blackfin/include/asm/portmux.h
> +++ b/arch/blackfin/include/asm/portmux.h
> @@ -23,10 +23,17 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state);
> #define gpio_pint_regs bfin_pint_regs
> #define adi_internal_set_wake bfin_internal_set_wake
>
> -#define peripheral_request(per, label) (0)
> -#define peripheral_free(per)
> -#define peripheral_request_list(per, label) (0)
> -#define peripheral_free_list(per)
> +static inline int peripheral_request(unsigned short per, const char *label)
> +{
> + return 0;
> +}
> +static inline void peripheral_free(unsigned short per) {}
> +static inline int peripheral_request_list(const unsigned short per[],
> + const char *label)
> +{
> + return 0;
> +}
> +static inline void peripheral_free_list(const unsigned short per[]) {}
> int pinmux_request(unsigned short per, const char *label);
> void pinmux_free(unsigned short per);
> int pinmux_request_list(const unsigned short per[], const char *label);
> --
> 1.7.9.5
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
