diff mbox

blackfin: convert pinmux request API into empty static inline functions for bf609 and bf548

Message ID 1423215699-11153-1-git-send-email-sonic.adi@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

sonic zhang Feb. 6, 2015, 9:41 a.m. UTC 
From: Sonic Zhang <sonic.zhang@analog.com>

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
---
 arch/blackfin/include/asm/portmux.h |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Comments

Dmitry Torokhov Feb. 6, 2015, 11:30 p.m. UTC | #1 
On Fri, Feb 06, 2015 at 05:41:39PM +0800, Sonic Zhang wrote:
> From: Sonic Zhang <sonic.zhang@analog.com>
> 
> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>

Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

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
>
diff mbox

Patch

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);