power: supply: collie_battery: Convert to GPIO descriptors (part 2)

Finish the job started by the commit ba940ed83218 ("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>

diff --git a/drivers/power/supply/collie_battery.c b/drivers/power/supply/collie_battery.c
index 7fb9b549f2dea0f15760454f7a5c5cd86a181042..68390bd1004f042ed9923d3c211faa40b27f120f 100644 (file)
--- a/drivers/power/supply/collie_battery.c
+++ b/drivers/power/supply/collie_battery.c
@@ -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);
@@ -440,7 +440,7 @@ err_put_gpio_full:
 
 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);