aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2015-06-12 03:19:34 -0400
committerSebastian Reichel <sre@kernel.org>2015-06-12 22:06:33 -0400
commit0007fa362a88f09a1b3e073434c83d35cc1e1e1c (patch)
tree9935985a04baa601cbee56dc3a679ff9ac2c3d93
parentf4ed950a63fc9590287f0f4fb0698e530b42b8a6 (diff)
power_supply: bq25890: use flags argument of devm_gpiod_get
Since 39b2bbe3d715 (gpio: add flags argument to gpiod_get*() functions) which appeared in v3.17-rc1, the gpiod_get* functions take an additional parameter that allows to specify direction and initial value for output. Simplify driver accordingly. Furthermore this is one caller less that stops us making the flags argument to gpiod_get*() mandatory. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sebastian Reichel <sre@kernel.org>
-rw-r--r--drivers/power/bq25890_charger.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/power/bq25890_charger.c b/drivers/power/bq25890_charger.c
index 16b7c7bc987d..f993a55cde20 100644
--- a/drivers/power/bq25890_charger.c
+++ b/drivers/power/bq25890_charger.c
@@ -721,19 +721,14 @@ static int bq25890_usb_notifier(struct notifier_block *nb, unsigned long val,
721 721
722static int bq25890_irq_probe(struct bq25890_device *bq) 722static int bq25890_irq_probe(struct bq25890_device *bq)
723{ 723{
724 int ret;
725 struct gpio_desc *irq; 724 struct gpio_desc *irq;
726 725
727 irq = devm_gpiod_get_index(bq->dev, BQ25890_IRQ_PIN, 0); 726 irq = devm_gpiod_get_index(bq->dev, BQ25890_IRQ_PIN, 0, GPIOD_IN);
728 if (IS_ERR(irq)) { 727 if (IS_ERR(irq)) {
729 dev_err(bq->dev, "Could not probe irq pin.\n"); 728 dev_err(bq->dev, "Could not probe irq pin.\n");
730 return PTR_ERR(irq); 729 return PTR_ERR(irq);
731 } 730 }
732 731
733 ret = gpiod_direction_input(irq);
734 if (ret < 0)
735 return ret;
736
737 return gpiod_to_irq(irq); 732 return gpiod_to_irq(irq);
738} 733}
739 734