diff mbox series

[v1,1/1] power: supply: collie_battery: Convert to GPIO descriptors (part 2)

Message ID 20230112140209.61228-1-andriy.shevchenko@linux.intel.com
State Accepted
Commit fccd2b763c3476d20c16e2e8534d345e5e013b4a
Headers show
Series [v1,1/1] power: supply: collie_battery: Convert to GPIO descriptors (part 2) | expand

Commit Message

Andy Shevchenko Jan. 12, 2023, 2:02 p.m. UTC
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>
---
 drivers/power/supply/collie_battery.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Linus Walleij Jan. 16, 2023, 10:33 a.m. UTC | #1
On Thu, Jan 12, 2023 at 3:02 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:

> 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>

Yours,
Linus Walleij
Sebastian Reichel Feb. 3, 2023, 12:30 p.m. UTC | #2
Hi,

On Mon, Jan 16, 2023 at 11:33:51AM +0100, Linus Walleij wrote:
> On Thu, Jan 12, 2023 at 3:02 PM Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
> 
> > 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>

Thanks, queued.

-- Sebastian
diff mbox series

Patch

diff --git a/drivers/power/supply/collie_battery.c b/drivers/power/supply/collie_battery.c
index 7fb9b549f2de..68390bd1004f 100644
--- 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 @@  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);