Skip to content

Commit fccd2b7

Browse files
andy-shevsre
authored andcommitted
power: supply: collie_battery: Convert to GPIO descriptors (part 2)
Finish the job started by the commit ba940ed ("power: supply: collie_battery: Convert to GPIO descriptors"), i.e. convert the use of gpio_to_irq() to gpiod_to_irq(). No functional changes intended. Signed-off-by: Andy Shevchenko <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Signed-off-by: Sebastian Reichel <[email protected]>
1 parent c85c191 commit fccd2b7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/power/supply/collie_battery.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ static int collie_bat_probe(struct ucb1x00_dev *dev)
404404
goto err_psy_reg_bu;
405405
}
406406

407-
ret = request_irq(gpio_to_irq(COLLIE_GPIO_CO),
407+
ret = request_irq(gpiod_to_irq(collie_bat_main.gpio_full),
408408
collie_bat_gpio_isr,
409409
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
410410
"main full", &collie_bat_main);
@@ -440,7 +440,7 @@ static int collie_bat_probe(struct ucb1x00_dev *dev)
440440

441441
static void collie_bat_remove(struct ucb1x00_dev *dev)
442442
{
443-
free_irq(gpio_to_irq(COLLIE_GPIO_CO), &collie_bat_main);
443+
free_irq(gpiod_to_irq(collie_bat_main.gpio_full), &collie_bat_main);
444444
power_supply_unregister(collie_bat_bu.psy);
445445
power_supply_unregister(collie_bat_main.psy);
446446

0 commit comments

Comments
 (0)