gpiolib: Join string literals back

For easy grepping on debug purposes join string literals back in the
messages.

While here, fix couple of small indentation issues.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index c6f77e8..f15a222 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1664,8 +1664,7 @@ static void gpiochip_set_cascaded_irqchip(struct gpio_chip *gpiochip,
        if (parent_handler) {
                if (gpiochip->can_sleep) {
                        chip_err(gpiochip,
-                                "you cannot have chained interrupts on a "
-                                "chip that may sleep\n");
+                                "you cannot have chained interrupts on a chip that may sleep\n");
                        return;
                }
                /*
@@ -1850,8 +1849,7 @@ static int gpiochip_add_irqchip(struct gpio_chip *gpiochip,
                return 0;
 
        if (gpiochip->irq.parent_handler && gpiochip->can_sleep) {
-               chip_err(gpiochip, "you cannot have chained interrupts on a "
-                        "chip that may sleep\n");
+               chip_err(gpiochip, "you cannot have chained interrupts on a chip that may sleep\n");
                return -EINVAL;
        }
 
@@ -3272,8 +3270,8 @@ int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
 
        if (test_bit(FLAG_IS_OUT, &desc->flags)) {
                chip_err(chip,
-                         "%s: tried to flag a GPIO set as output for IRQ\n",
-                         __func__);
+                        "%s: tried to flag a GPIO set as output for IRQ\n",
+                        __func__);
                return -EIO;
        }
 
@@ -4228,7 +4226,7 @@ static int __init gpiolib_dev_init(void)
        int ret;
 
        /* Register GPIO sysfs bus */
-       ret  = bus_register(&gpio_bus_type);
+       ret = bus_register(&gpio_bus_type);
        if (ret < 0) {
                pr_err("gpiolib: could not register GPIO bus type\n");
                return ret;