Commit fccd2b76 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Sebastian Reichel
Browse files

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



Finish the job started by the commit ba940ed8 ("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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent c85c1916

drivers/power/supply/collie_battery.c

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ 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);