p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Andy Shevchenko 2018-07-03 03:39:03 +03:00 committed by Linus Walleij
parent 2b6c83cad1
commit b1911710e6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpio/gpiolib.c
View File

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