1 files changed, 9 insertions, 25 deletions

diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c
index ff31939978ae..0ea756b77519 100644
--- a/drivers/nfc/st21nfca/i2c.c
+++ b/drivers/nfc/st21nfca/i2c.c
@@ -271,6 +271,7 @@ static int st21nfca_hci_i2c_write(void *phy_id, struct sk_buff *skb)
 static int get_frame_size(u8 *buf, int buflen)
 {
         int len = 0;
+
         if (buf[len + 1] == ST21NFCA_SOF_EOF)
                 return 0;
 
@@ -311,6 +312,7 @@ static int check_crc(u8 *buf, int buflen)
 static int st21nfca_hci_i2c_repack(struct sk_buff *skb)
 {
         int i, j, r, size;
+
         if (skb->len < 1 || (skb->len > 1 && skb->data[1] != 0))
                 return -EBADMSG;
 
@@ -525,24 +527,19 @@ 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 */
         r = irq_of_parse_and_map(pp, 0);
         if (r < 0) {
-                nfc_err(&client->dev,
-                                "Unable to get irq, error: %d\n", r);
+                nfc_err(&client->dev, "Unable to get irq, error: %d\n", r);
                 return r;
         }
 
@@ -576,32 +573,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 */
@@ -711,7 +696,6 @@ static struct i2c_driver st21nfca_hci_i2c_driver = {
         .driver = {
                 .owner = THIS_MODULE,
                 .name = ST21NFCA_HCI_I2C_DRIVER_NAME,
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(of_st21nfca_i2c_match),
         },
         .probe = st21nfca_hci_i2c_probe,