diff options
| author |   Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2015-06-12 10:54:04 +0200 |
|---|---|---|
| committer |   Sebastian Reichel <sre@kernel.org> | 2015-06-13 04:06:38 +0200 |
| commit | e31cd7824d054d30ffc9f45550343123bc437e17 (patch) | |
| tree | fc389a60efd30259daf8bbef8b95a82e7a411e54 /drivers/power | |
| parent | power_supply: bq25890: use flags argument of devm_gpiod_get (diff) | |
| download | linux-dev-e31cd7824d054d30ffc9f45550343123bc437e17.tar.xz linux-dev-e31cd7824d054d30ffc9f45550343123bc437e17.zip | |
power_supply: bq24257: 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>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/bq24257_charger.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/power/bq24257_charger.c b/drivers/power/bq24257_charger.c index ce7f5bbfd5e3..5859bc7c1616 100644 --- a/drivers/power/bq24257_charger.c +++ b/drivers/power/bq24257_charger.c @@ -608,31 +608,26 @@ static int bq24257_power_supply_init(struct bq24257_device *bq) static int bq24257_irq_probe(struct bq24257_device *bq) { - int ret; struct gpio_desc *stat_irq; - stat_irq = devm_gpiod_get_index(bq->dev, BQ24257_STAT_IRQ, 0); + stat_irq = devm_gpiod_get_index(bq->dev, BQ24257_STAT_IRQ, 0, GPIOD_IN); if (IS_ERR(stat_irq)) { dev_err(bq->dev, "could not probe stat_irq pin\n"); return PTR_ERR(stat_irq); } - ret = gpiod_direction_input(stat_irq); - if (ret < 0) - return ret; - return gpiod_to_irq(stat_irq); } static int bq24257_pg_gpio_probe(struct bq24257_device *bq) { - bq->pg = devm_gpiod_get_index(bq->dev, BQ24257_PG_GPIO, 0); + bq->pg = devm_gpiod_get_index(bq->dev, BQ24257_PG_GPIO, 0, GPIOD_IN); if (IS_ERR(bq->pg)) { dev_err(bq->dev, "could not probe PG pin\n"); return PTR_ERR(bq->pg); } - return gpiod_direction_input(bq->pg); + return 0; } static int bq24257_fw_probe(struct bq24257_device *bq) |