openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

power_supply: bq24257: use flags argument of devm_gpiod_get 

Since 39b2bbe3d7 (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>
This commit is contained in:
Uwe Kleine-König 2015-06-12 10:54:04 +02:00 committed by Sebastian Reichel
parent 0007fa362a
commit e31cd7824d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/power/bq24257_charger.c
View File

@ -608,31 +608,26 @@ static int bq24257_power_supply_init(struct bq24257_device *bq)
static int bq24257_irq_probe(struct bq24257_device *bq) static int bq24257_irq_probe(struct bq24257_device *bq)
{ {
int ret;
struct gpio_desc *stat_irq; 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)) { if (IS_ERR(stat_irq)) {
dev_err(bq->dev, "could not probe stat_irq pin\n"); dev_err(bq->dev, "could not probe stat_irq pin\n");
return PTR_ERR(stat_irq); return PTR_ERR(stat_irq);
} }
ret = gpiod_direction_input(stat_irq);
if (ret < 0)
return ret;
return gpiod_to_irq(stat_irq); return gpiod_to_irq(stat_irq);
} }
static int bq24257_pg_gpio_probe(struct bq24257_device *bq) 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)) { if (IS_ERR(bq->pg)) {
dev_err(bq->dev, "could not probe PG pin\n"); dev_err(bq->dev, "could not probe PG pin\n");
return PTR_ERR(bq->pg); return PTR_ERR(bq->pg);
} }
return gpiod_direction_input(bq->pg); return 0;
} }
static int bq24257_fw_probe(struct bq24257_device *bq) static int bq24257_fw_probe(struct bq24257_device *bq)