Skip to content

Commit

Permalink
power: supply: collie_battery: Convert to GPIO descriptors (part 2)
Browse files Browse the repository at this point in the history
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 <andriy.shevchenko@linux.intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
  • Loading branch information
Andy Shevchenko authored and Sebastian Reichel committed Feb 3, 2023
1 parent c85c191 commit fccd2b7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/power/supply/collie_battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ static int collie_bat_probe(struct ucb1x00_dev *dev)
goto err_psy_reg_bu;
}

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

static void collie_bat_remove(struct ucb1x00_dev *dev)
{
free_irq(gpio_to_irq(COLLIE_GPIO_CO), &collie_bat_main);
free_irq(gpiod_to_irq(collie_bat_main.gpio_full), &collie_bat_main);
power_supply_unregister(collie_bat_bu.psy);
power_supply_unregister(collie_bat_main.psy);

Expand Down

0 comments on commit fccd2b7

Please sign in to comment.