Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bfe7680 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

NFC: nxp-nci_i2c: use flags argument of devm_gpiod_get_index 



Since 39b2bbe3 (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 which even makes error checking more correct
because gpiod_direction_{in,out}put might fail. Furthermore this is one
caller less that stops us making the flags argument to gpiod_get*()
mandatory.

Acked-by: default avatarOleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent a33c380e

drivers/nfc/nxp-nci/i2c.c

+3 −7
Original line number Diff line number Diff line
@@ -318,19 +318,15 @@ static int nxp_nci_i2c_acpi_config(struct nxp_nci_i2c_phy *phy) 
	struct i2c_client *client = phy->i2c_dev;

	struct gpio_desc *gpiod_en, *gpiod_fw, *gpiod_irq;



	gpiod_en = devm_gpiod_get_index(&client->dev, NULL, 2);

	gpiod_fw = devm_gpiod_get_index(&client->dev, NULL, 1);

	gpiod_irq = devm_gpiod_get_index(&client->dev, NULL, 0);

	gpiod_en = devm_gpiod_get_index(&client->dev, NULL, 2, GPIOD_OUT_LOW);

	gpiod_fw = devm_gpiod_get_index(&client->dev, NULL, 1, GPIOD_OUT_LOW);

	gpiod_irq = devm_gpiod_get_index(&client->dev, NULL, 0, GPIOD_IN);



	if (IS_ERR(gpiod_en) || IS_ERR(gpiod_fw) || IS_ERR(gpiod_irq)) {

		nfc_err(&client->dev, "No GPIOs\n");

		return -EINVAL;

	}



	gpiod_direction_output(gpiod_en, 0);

	gpiod_direction_output(gpiod_fw, 0);

	gpiod_direction_input(gpiod_irq);



	client->irq = gpiod_to_irq(gpiod_irq);

	if (client->irq < 0) {

		nfc_err(&client->dev, "No IRQ\n");