ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request

Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-sa1100/h3100.c b/arch/arm/mach-sa1100/h3100.c
index 793e68c2994813f1796d16dacb2f9f41186de020..0c7cea0dc01314381137ed85070c5e678371bba2 100644 (file)
--- a/arch/arm/mach-sa1100/h3100.c
+++ b/arch/arm/mach-sa1100/h3100.c
@@ -31,6 +31,8 @@ static void h3100_lcd_power(int enable)
                gpio_set_value(H3100_GPIO_LCD_3V_ON, enable);
                gpio_direction_output(H3XXX_EGPIO_LCD_ON, enable);
                gpio_free(H3XXX_EGPIO_LCD_ON);
+       } else {
+               pr_err("%s: can't request H3XXX_EGPIO_LCD_ON\n", __func__);
        }
 }
 

diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 47587cce0000f5a79453afb8af9cd675d892c130..af3b71459f8d2adf794d91ac0da199d2e9eadfd5 100644 (file)
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -27,14 +27,22 @@
  */
 static void h3600_lcd_power(int enable)
 {
-       if (gpio_request(H3XXX_EGPIO_LCD_ON, "LCD power"))
+       if (gpio_request(H3XXX_EGPIO_LCD_ON, "LCD power")) {
+               pr_err("%s: can't request H3XXX_EGPIO_LCD_ON\n", __func__);
                goto err1;
-       if (gpio_request(H3600_EGPIO_LCD_PCI, "LCD control"))
+       }
+       if (gpio_request(H3600_EGPIO_LCD_PCI, "LCD control")) {
+               pr_err("%s: can't request H3XXX_EGPIO_LCD_PCI\n", __func__);
                goto err2;
-       if (gpio_request(H3600_EGPIO_LCD_5V_ON, "LCD 5v"))
+       }
+       if (gpio_request(H3600_EGPIO_LCD_5V_ON, "LCD 5v")) {
+               pr_err("%s: can't request H3XXX_EGPIO_LCD_5V_ON\n", __func__);
                goto err3;
-       if (gpio_request(H3600_EGPIO_LVDD_ON, "LCD 9v/-6.5v"))
+       }
+       if (gpio_request(H3600_EGPIO_LVDD_ON, "LCD 9v/-6.5v")) {
+               pr_err("%s: can't request H3600_EGPIO_LVDD_ON\n", __func__);
                goto err4;
+       }
 
        gpio_direction_output(H3XXX_EGPIO_LCD_ON, enable);
        gpio_direction_output(H3600_EGPIO_LCD_PCI, enable);

diff --git a/arch/arm/mach-sa1100/h3xxx.c b/arch/arm/mach-sa1100/h3xxx.c
index a7a1982d84118764a1ef9a7febc418f22d14f576..b0784c974c2deda1ecc76f24d296a9937f13bd85 100644 (file)
--- a/arch/arm/mach-sa1100/h3xxx.c
+++ b/arch/arm/mach-sa1100/h3xxx.c
@@ -83,8 +83,10 @@ static void h3xxx_set_vpp(int vpp)
 static int h3xxx_flash_init(void)
 {
        int err = gpio_request(H3XXX_EGPIO_VPP_ON, "Flash Vpp");
-       if (err)
+       if (err) {
+               pr_err("%s: can't request H3XXX_EGPIO_VPP_ON\n", __func__);
                return err;
+       }
 
        err = gpio_direction_output(H3XXX_EGPIO_VPP_ON, 0);
        if (err)
@@ -143,11 +145,15 @@ static u_int h3xxx_uart_get_mctrl(struct uart_port *port)
 
 static void h3xxx_uart_pm(struct uart_port *port, u_int state, u_int oldstate)
 {
-       if (port->mapbase == _Ser3UTCR0)
+       if (port->mapbase == _Ser3UTCR0) {
                if (!gpio_request(H3XXX_EGPIO_RS232_ON, "RS232 transceiver")) {
                        gpio_direction_output(H3XXX_EGPIO_RS232_ON, !state);
                        gpio_free(H3XXX_EGPIO_RS232_ON);
+               } else {
+                       pr_err("%s: can't request H3XXX_EGPIO_RS232_ON\n",
+                               __func__);
                }
+       }
 }
 
 /*