[PATCH 3/4] at91sam9*: use gpio_request_output()

[Jean-Christophe PLAGNIOL-VILLARD]

On 23:29 Thu 31 Jan     , Antony Pavlov wrote:
> Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
> ---
>  arch/arm/boards/at91sam9261ek/init.c  |   18 +-----------------
>  arch/arm/boards/at91sam9263ek/init.c  |   18 +-----------------
>  arch/arm/boards/at91sam9m10ihd/init.c |   18 +-----------------
>  3 files changed, 3 insertions(+), 51 deletions(-)
> 
> diff --git a/arch/arm/boards/at91sam9261ek/init.c b/arch/arm/boards/at91sam9261ek/init.c
> index 2597ff8..220dd2f 100644
> --- a/arch/arm/boards/at91sam9261ek/init.c
> +++ b/arch/arm/boards/at91sam9261ek/init.c
> @@ -153,22 +153,6 @@ static void ek_add_device_udc(void) {}
>   * LCD Controller
>   */
>  #if defined(CONFIG_DRIVER_VIDEO_ATMEL)
> -static int ek_gpio_request_output(int gpio, const char *name)
> -{
> -	int ret;
> -
> -	ret = gpio_request(gpio, name);
> -	if (ret) {
> -		pr_err("%s: can not request gpio %d (%d)\n", name, gpio, ret);
> -		return ret;
> -	}
> -
> -	ret = gpio_direction_output(gpio, 1);
> -	if (ret)
> -		pr_err("%s: can not configure gpio %d as output (%d)\n", name, gpio, ret);
> -	return ret;
> -}
> -
>  /* TFT */
>  static struct fb_videomode at91_tft_vga_modes[] = {
>  	{
> @@ -211,7 +195,7 @@ static struct atmel_lcdfb_platform_data ek_lcdc_data = {
>  
>  static int at91_lcdc_gpio(void)
>  {
> -	return ek_gpio_request_output(AT91_PIN_PA12, "lcdc_tft_power");
> +	return gpio_request_output(AT91_PIN_PA12, "lcdc_tft_power", 1);
>  }
>  
>  static void ek_add_device_lcdc(void)
> diff --git a/arch/arm/boards/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c
> index 6db6a5b..1287c23 100644
> --- a/arch/arm/boards/at91sam9263ek/init.c
> +++ b/arch/arm/boards/at91sam9263ek/init.c
> @@ -153,22 +153,6 @@ static void ek_add_device_udc(void) {}
>   * LCD Controller
>   */
>  #if defined(CONFIG_DRIVER_VIDEO_ATMEL)
> -static int ek_gpio_request_output(int gpio, const char *name)
> -{
> -	int ret;
> -
> -	ret = gpio_request(gpio, name);
> -	if (ret) {
> -		pr_err("%s: can not request gpio %d (%d)\n", name, gpio, ret);
> -		return ret;
> -	}
> -
> -	ret = gpio_direction_output(gpio, 1);
> -	if (ret)
> -		pr_err("%s: can not configure gpio %d as output (%d)\n", name, gpio, ret);
> -	return ret;
> -}
> -
>  static struct fb_videomode at91_tft_vga_modes[] = {
>  	{
>  		.name		= "TX09D50VM1CCA @ 60",
> @@ -208,7 +192,7 @@ static struct atmel_lcdfb_platform_data ek_lcdc_data = {
>  
>  static void ek_add_device_lcdc(void)
>  {
> -	if (ek_gpio_request_output(AT91_PIN_PA30, "lcdc_power"))
> +	if (gpio_request_output(AT91_PIN_PA30, "lcdc_power", 1))
>  		return;
>  
>  	at91_add_device_lcdc(&ek_lcdc_data);
> diff --git a/arch/arm/boards/at91sam9m10ihd/init.c b/arch/arm/boards/at91sam9m10ihd/init.c
> index 325a250..859ee1f 100644
> --- a/arch/arm/boards/at91sam9m10ihd/init.c
> +++ b/arch/arm/boards/at91sam9m10ihd/init.c
> @@ -174,22 +174,6 @@ static int at91sam9m10g45ek_mem_init(void)
>  mem_initcall(at91sam9m10g45ek_mem_init);
>  
>  #if defined(CONFIG_DRIVER_VIDEO_ATMEL)
> -static int ek_gpio_request_output(int gpio, const char *name)
> -{
> -	int ret;
> -
> -	ret = gpio_request(gpio, name);
> -	if (ret) {
> -		pr_err("%s: can not request gpio %d (%d)\n", name, gpio, ret);
> -		return ret;
> -	}
> -
> -	ret = gpio_direction_output(gpio, 1);
> -	if (ret)
> -		pr_err("%s: can not configure gpio %d as output (%d)\n", name, gpio, ret);
> -	return ret;
> -}
> -
>  static struct fb_videomode at91fb_default_monspecs[] = {
>  	{
>  		.name		= "MULTEK",
> @@ -229,7 +213,7 @@ static struct atmel_lcdfb_platform_data ek_lcdc_data = {
>  
>  static void ek_add_device_lcd(void)
>  {
> -	if (ek_gpio_request_output(AT91_PIN_PE6, "lcdc_power"))
> +	if (gpio_request_output(AT91_PIN_PE6, "lcdc_power", 1))
we loose the error messages

NACK

Best Regards,
J.
>  		return;
>  
>  	at91_add_device_lcdc(&ek_lcdc_data);
> -- 
> 1.7.10.4
>