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

Commit 0be8ce73 authored by Axel Lin's avatar Axel Lin Committed by Samuel Ortiz
Browse files

NFC: st21nfca: Convert to use devm_gpio_request_one 



This simplifies the code a bit.

Acked-by: default avatarChristophe RICARD <christophe-h.ricard@st.com>
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent ce3a5de7

drivers/nfc/st21nfca/i2c.c

+6 −22
Original line number Diff line number Diff line
@@ -525,17 +525,13 @@ static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client) 
	}



	/* GPIO request and configuration */

	r = devm_gpio_request(&client->dev, gpio, "clf_enable");

	r = devm_gpio_request_one(&client->dev, gpio, GPIOF_OUT_INIT_HIGH,

				  "clf_enable");

	if (r) {

		nfc_err(&client->dev, "Failed to request enable pin\n");

		return -ENODEV;

	}



	r = gpio_direction_output(gpio, 1);

	if (r) {

		nfc_err(&client->dev, "Failed to set enable pin direction as output\n");

		return -ENODEV;

	}

	phy->gpio_ena = gpio;



	/* IRQ */
@@ -576,32 +572,20 @@ static int st21nfca_hci_i2c_request_resources(struct i2c_client *client) 
	phy->gpio_ena = pdata->gpio_ena;

	phy->irq_polarity = pdata->irq_polarity;



	r = devm_gpio_request(&client->dev, phy->gpio_irq, "wake_up");

	r = devm_gpio_request_one(&client->dev, phy->gpio_irq, GPIOF_IN,

				  "wake_up");

	if (r) {

		pr_err("%s : gpio_request failed\n", __FILE__);

		return -ENODEV;

	}



	r = gpio_direction_input(phy->gpio_irq);

	if (r) {

		pr_err("%s : gpio_direction_input failed\n", __FILE__);

		return -ENODEV;

	}



	if (phy->gpio_ena > 0) {

		r = devm_gpio_request(&client->dev,

					phy->gpio_ena, "clf_enable");

		r = devm_gpio_request_one(&client->dev, phy->gpio_ena,

					  GPIOF_OUT_INIT_HIGH, "clf_enable");

		if (r) {

			pr_err("%s : ena gpio_request failed\n", __FILE__);

			return -ENODEV;

		}

		r = gpio_direction_output(phy->gpio_ena, 1);



		if (r) {

			pr_err("%s : ena gpio_direction_output failed\n",

			       __FILE__);

			return -ENODEV;

		}

	}



	/* IRQ */