[PATCH] NFC: nxp-nci_i2c: use flags argument of devm_gpiod_get_index

[PATCH] NFC: nxp-nci_i2c: use flags argument of devm_gpiod_get_index

[Uwe Kleine-König]

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 which even make 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.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Hello,

I intend to make the flags parameter to gpiod_get* mandatory once
4.2-rc1 arrives. So unless this patch makes it in, I'd like to get an
Ack to take it via the gpio tree together with the change to gpiod_get.

Note this patch depends on 
551e306905ef (NFC: nxp-nci_i2c: Add support for enumerating through ACPI)
which only appeared in today's next.

Best regards
Uwe

 drivers/nfc/nxp-nci/i2c.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index 2f77f1d03638..fac80c691914 100644
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -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");
-- 
2.1.4

Re: [PATCH] NFC: nxp-nci_i2c: use flags argument of devm_gpiod_get_index

[Uwe Kleine-König]

Hello,

On Wed, Jun 17, 2015 at 11:10:52AM +0200, Uwe Kleine-König wrote:
> 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 which even make error checking more correct
I did s/make/makes/ in my tree.

> 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.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> Hello,
> 
> I intend to make the flags parameter to gpiod_get* mandatory once
> 4.2-rc1 arrives. So unless this patch makes it in, I'd like to get an
> Ack to take it via the gpio tree together with the change to gpiod_get.
> 
> Note this patch depends on 
> 551e306905ef (NFC: nxp-nci_i2c: Add support for enumerating through ACPI)
> which only appeared in today's next.
This still applies. So an ack would be very welcome.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Re: [PATCH] NFC: nxp-nci_i2c: use flags argument of devm_gpiod_get_index

[Oleg Zhurakivskyy]

Hello Uwe,

On 06/23/2015 03:30 PM, Uwe Kleine-König wrote:
>> Note this patch depends on
>> 551e306905ef (NFC: nxp-nci_i2c: Add support for enumerating through ACPI)
>> which only appeared in today's next.
> This still applies. So an ack would be very welcome.

Your changes look fine. Thanks for updating the driver. And sorry for the delay.

Regards,
Oleg

Re: [PATCH] NFC: nxp-nci_i2c: use flags argument of devm_gpiod_get_index

[Uwe Kleine-König]

Hello Oleg,

On Wed, Jun 24, 2015 at 09:20:17AM +0300, Oleg Zhurakivskyy wrote:
> On 06/23/2015 03:30 PM, Uwe Kleine-König wrote:
> >> Note this patch depends on
> >> 551e306905ef (NFC: nxp-nci_i2c: Add support for enumerating through ACPI)
> >> which only appeared in today's next.
> > This still applies. So an ack would be very welcome.
> 
> Your changes look fine. Thanks for updating the driver. And sorry for the delay.
I interpret this as an ack, and assuming the patch won't make it in for
4.2-rc1 via nfc I'll send it to Linus Walleij together with the gpiod
change.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |