Skip to content

Commit b191171

Browse files
andy-shevlinusw
authored andcommitted
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>
1 parent 2b6c83c commit b191171

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

drivers/gpio/gpiolib.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,8 +1664,7 @@ static void gpiochip_set_cascaded_irqchip(struct gpio_chip *gpiochip,
16641664
if (parent_handler) {
16651665
if (gpiochip->can_sleep) {
16661666
chip_err(gpiochip,
1667-
"you cannot have chained interrupts on a "
1668-
"chip that may sleep\n");
1667+
"you cannot have chained interrupts on a chip that may sleep\n");
16691668
return;
16701669
}
16711670
/*
@@ -1850,8 +1849,7 @@ static int gpiochip_add_irqchip(struct gpio_chip *gpiochip,
18501849
return 0;
18511850

18521851
if (gpiochip->irq.parent_handler && gpiochip->can_sleep) {
1853-
chip_err(gpiochip, "you cannot have chained interrupts on a "
1854-
"chip that may sleep\n");
1852+
chip_err(gpiochip, "you cannot have chained interrupts on a chip that may sleep\n");
18551853
return -EINVAL;
18561854
}
18571855

@@ -3272,8 +3270,8 @@ int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
32723270

32733271
if (test_bit(FLAG_IS_OUT, &desc->flags)) {
32743272
chip_err(chip,
3275-
"%s: tried to flag a GPIO set as output for IRQ\n",
3276-
__func__);
3273+
"%s: tried to flag a GPIO set as output for IRQ\n",
3274+
__func__);
32773275
return -EIO;
32783276
}
32793277

@@ -4228,7 +4226,7 @@ static int __init gpiolib_dev_init(void)
42284226
int ret;
42294227

42304228
/* Register GPIO sysfs bus */
4231-
ret = bus_register(&gpio_bus_type);
4229+
ret = bus_register(&gpio_bus_type);
42324230
if (ret < 0) {
42334231
pr_err("gpiolib: could not register GPIO bus type\n");
42344232
return ret;

0 commit comments

Comments
 (0)