Skip to contentSkip to conversation

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

PATCH In review Andy Shevchenko 3 participants 3 messages Jan 12, 2023 – Feb 3, 2023 Power supply

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/power/supply/collie_battery.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/power/supply/collie_battery.c +2 -2
index 7fb9b549f2de..68390bd1004f 100644
@@ -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);
 
Signature · 1 line
2.39.0