NFC: st-nci: Get rid of platform data

Legacy platform data must go away. We are on the safe side here since
there are no users of it in the kernel.

If anyone by any odd reason needs it the GPIO lookup tables and
built-in device properties at your service.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 1616d8f10767a1a75cae89cd1183c2cd48e6d514..f83b9b4d452efa432d2629d9be60b0b661b71f25 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9071,7 +9071,6 @@ F:        include/linux/platform_data/nfcmrvl.h
 F:     include/linux/platform_data/nxp-nci.h
 F:     include/linux/platform_data/pn544.h
 F:     include/linux/platform_data/st21nfca.h
-F:     include/linux/platform_data/st-nci.h
 F:     Documentation/devicetree/bindings/net/nfc/
 
 NFS, SUNRPC, AND LOCKD CLIENTS

diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
index 9dfae0efa922b099e30b984784c82dd12c33996e..6d3d8e43fa50475670edd08bad91f8c99a54d3cf 100644 (file)
--- a/drivers/nfc/st-nci/i2c.c
+++ b/drivers/nfc/st-nci/i2c.c
@@ -27,7 +27,6 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/nfc.h>
-#include <linux/platform_data/st-nci.h>
 
 #include "st-nci.h"
 
@@ -40,6 +39,7 @@
 #define ST_NCI_I2C_MIN_SIZE 4   /* PCB(1) + NCI Packet header(3) */
 #define ST_NCI_I2C_MAX_SIZE 250 /* req 4.2.1 */
 
+#define ST_NCI_DRIVER_NAME "st_nci"
 #define ST_NCI_I2C_DRIVER_NAME "st_nci_i2c"
 
 #define ST_NCI_GPIO_NAME_RESET "reset"
@@ -281,41 +281,10 @@ static int st_nci_i2c_of_request_resources(struct i2c_client *client)
        return 0;
 }
 
-static int st_nci_i2c_request_resources(struct i2c_client *client)
-{
-       struct st_nci_nfc_platform_data *pdata;
-       struct st_nci_i2c_phy *phy = i2c_get_clientdata(client);
-       int r;
-
-       pdata = client->dev.platform_data;
-       if (pdata == NULL) {
-               nfc_err(&client->dev, "No platform data\n");
-               return -EINVAL;
-       }
-
-       /* store for later use */
-       phy->gpio_reset = pdata->gpio_reset;
-       phy->irq_polarity = pdata->irq_polarity;
-
-       r = devm_gpio_request_one(&client->dev,
-                       phy->gpio_reset, GPIOF_OUT_INIT_HIGH,
-                       ST_NCI_GPIO_NAME_RESET);
-       if (r) {
-               pr_err("%s : reset gpio_request failed\n", __FILE__);
-               return r;
-       }
-
-       phy->se_status.is_ese_present = pdata->is_ese_present;
-       phy->se_status.is_uicc_present = pdata->is_uicc_present;
-
-       return 0;
-}
-
 static int st_nci_i2c_probe(struct i2c_client *client,
                                  const struct i2c_device_id *id)
 {
        struct st_nci_i2c_phy *phy;
-       struct st_nci_nfc_platform_data *pdata;
        int r;
 
        dev_dbg(&client->dev, "%s\n", __func__);
@@ -335,20 +304,12 @@ static int st_nci_i2c_probe(struct i2c_client *client,
 
        i2c_set_clientdata(client, phy);
 
-       pdata = client->dev.platform_data;
-       if (!pdata && client->dev.of_node) {
+       if (client->dev.of_node) {
                r = st_nci_i2c_of_request_resources(client);
                if (r) {
                        nfc_err(&client->dev, "No platform data\n");
                        return r;
                }
-       } else if (pdata) {
-               r = st_nci_i2c_request_resources(client);
-               if (r) {
-                       nfc_err(&client->dev,
-                               "Cannot get platform resources\n");
-                       return r;
-               }
        } else if (ACPI_HANDLE(&client->dev)) {
                r = st_nci_i2c_acpi_request_resources(client);
                if (r) {

diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c
index 89e341eba3ebe97407412c1cec99a3868849493a..ee8ea708d5b7797a88d1e1a1ccd882a52d840c3b 100644 (file)
--- a/drivers/nfc/st-nci/spi.c
+++ b/drivers/nfc/st-nci/spi.c
@@ -28,7 +28,6 @@
 #include <linux/delay.h>
 #include <linux/nfc.h>
 #include <net/nfc/nci.h>
-#include <linux/platform_data/st-nci.h>
 
 #include "st-nci.h"
 
@@ -41,6 +40,7 @@
 #define ST_NCI_SPI_MIN_SIZE 4   /* PCB(1) + NCI Packet header(3) */
 #define ST_NCI_SPI_MAX_SIZE 250 /* req 4.2.1 */
 
+#define ST_NCI_DRIVER_NAME "st_nci"
 #define ST_NCI_SPI_DRIVER_NAME "st_nci_spi"
 
 #define ST_NCI_GPIO_NAME_RESET "reset"
@@ -296,40 +296,9 @@ static int st_nci_spi_of_request_resources(struct spi_device *dev)
        return 0;
 }
 
-static int st_nci_spi_request_resources(struct spi_device *dev)
-{
-       struct st_nci_nfc_platform_data *pdata;
-       struct st_nci_spi_phy *phy = spi_get_drvdata(dev);
-       int r;
-
-       pdata = dev->dev.platform_data;
-       if (pdata == NULL) {
-               nfc_err(&dev->dev, "No platform data\n");
-               return -EINVAL;
-       }
-
-       /* store for later use */
-       phy->gpio_reset = pdata->gpio_reset;
-       phy->irq_polarity = pdata->irq_polarity;
-
-       r = devm_gpio_request_one(&dev->dev,
-                       phy->gpio_reset, GPIOF_OUT_INIT_HIGH,
-                       ST_NCI_GPIO_NAME_RESET);
-       if (r) {
-               pr_err("%s : reset gpio_request failed\n", __FILE__);
-               return r;
-       }
-
-       phy->se_status.is_ese_present = pdata->is_ese_present;
-       phy->se_status.is_uicc_present = pdata->is_uicc_present;
-
-       return 0;
-}
-
 static int st_nci_spi_probe(struct spi_device *dev)
 {
        struct st_nci_spi_phy *phy;
-       struct st_nci_nfc_platform_data *pdata;
        int r;
 
        dev_dbg(&dev->dev, "%s\n", __func__);
@@ -351,20 +320,12 @@ static int st_nci_spi_probe(struct spi_device *dev)
 
        spi_set_drvdata(dev, phy);
 
-       pdata = dev->dev.platform_data;
-       if (!pdata && dev->dev.of_node) {
+       if (dev->dev.of_node) {
                r = st_nci_spi_of_request_resources(dev);
                if (r) {
                        nfc_err(&dev->dev, "No platform data\n");
                        return r;
                }
-       } else if (pdata) {
-               r = st_nci_spi_request_resources(dev);
-               if (r) {
-                       nfc_err(&dev->dev,
-                               "Cannot get platform resources\n");
-                       return r;
-               }
        } else if (ACPI_HANDLE(&dev->dev)) {
                r = st_nci_spi_acpi_request_resources(dev);
                if (r) {

diff --git a/include/linux/platform_data/st-nci.h b/include/linux/platform_data/st-nci.h
deleted file mode 100644 (file)
index f6494b3..0000000
--- a/include/linux/platform_data/st-nci.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Driver include for ST NCI NFC chip family.
- *
- * Copyright (C) 2014-2015  STMicroelectronics SAS. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _ST_NCI_H_
-#define _ST_NCI_H_
-
-#define ST_NCI_DRIVER_NAME "st_nci"
-
-struct st_nci_nfc_platform_data {
-       unsigned int gpio_reset;
-       unsigned int irq_polarity;
-       bool is_ese_present;
-       bool is_uicc_present;
-};
-
-#endif /* _ST_NCI_H_ */