From 3b0b278312ba7d6c1eb8b2fb48d459fb7f341a20 Mon Sep 17 00:00:00 2001

From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Date: Mon, 29 Jul 2019 16:35:03 +0300

Subject: [PATCH] NFC: nxp-nci: Get rid of platform data

Git-commit: 3b0b278312ba7d6c1eb8b2fb48d459fb7f341a20

References: bsc#1185589

Patch-mainline: v5.4-rc1

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>

Tested-by: Sedat Dilek <sedat.dilek@gmail.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 MAINTAINERS                           |  1 -

 drivers/nfc/nxp-nci/core.c            |  1 -

 drivers/nfc/nxp-nci/i2c.c             |  9 +--------

 drivers/nfc/nxp-nci/nxp-nci.h         |  1 -

 include/linux/platform_data/nxp-nci.h | 19 -------------------

 5 files changed, 1 insertion(+), 30 deletions(-)

 delete mode 100644 include/linux/platform_data/nxp-nci.h

diff --git a/MAINTAINERS b/MAINTAINERS

index 9cc156c58f0c..ee663e0e2f2e 100644

--- a/MAINTAINERS

+++ b/MAINTAINERS

@@ -11327,7 +11327,6 @@ F:	include/net/nfc/

 F:	include/uapi/linux/nfc.h

 F:	drivers/nfc/

 F:	include/linux/platform_data/nfcmrvl.h

-F:	include/linux/platform_data/nxp-nci.h

 F:	Documentation/devicetree/bindings/net/nfc/

 NFS, SUNRPC, AND LOCKD CLIENTS

diff --git a/drivers/nfc/nxp-nci/core.c b/drivers/nfc/nxp-nci/core.c

index 8dafc696719f..aed18ca60170 100644

--- a/drivers/nfc/nxp-nci/core.c

+++ b/drivers/nfc/nxp-nci/core.c

@@ -14,7 +14,6 @@

 #include <linux/gpio.h>

 #include <linux/module.h>

 #include <linux/nfc.h>

-#include <linux/platform_data/nxp-nci.h>

 #include <net/nfc/nci_core.h>

diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c

index 5db71869f04b..47b3b7e612e6 100644

--- a/drivers/nfc/nxp-nci/i2c.c

+++ b/drivers/nfc/nxp-nci/i2c.c

@@ -23,7 +23,6 @@

 #include <linux/gpio/consumer.h>

 #include <linux/of_gpio.h>

 #include <linux/of_irq.h>

-#include <linux/platform_data/nxp-nci.h>

 #include <asm/unaligned.h>

 #include <net/nfc/nfc.h>

@@ -304,7 +303,6 @@ static int nxp_nci_i2c_probe(struct i2c_client *client,

 			    const struct i2c_device_id *id)

 {

 	struct nxp_nci_i2c_phy *phy;

-	struct nxp_nci_nfc_platform_data *pdata;

 	int r;

 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {

@@ -323,17 +321,12 @@ static int nxp_nci_i2c_probe(struct i2c_client *client,

 	phy->i2c_dev = client;

 	i2c_set_clientdata(client, phy);

-	pdata = client->dev.platform_data;

-

-	if (!pdata && client->dev.of_node) {

+	if (client->dev.of_node) {

 		r = nxp_nci_i2c_parse_devtree(client);

 		if (r < 0) {

 			nfc_err(&client->dev, "Failed to get DT data\n");

 			goto probe_exit;

 		}

-	} else if (pdata) {

-		phy->gpio_en = pdata->gpio_en;

-		phy->gpio_fw = pdata->gpio_fw;

 	} else if (ACPI_HANDLE(&client->dev)) {

 		r = nxp_nci_i2c_acpi_config(phy);

 		if (r < 0)

diff --git a/drivers/nfc/nxp-nci/nxp-nci.h b/drivers/nfc/nxp-nci/nxp-nci.h

index 6fe7c45544bf..ae3fb2735a4e 100644

--- a/drivers/nfc/nxp-nci/nxp-nci.h

+++ b/drivers/nfc/nxp-nci/nxp-nci.h

@@ -14,7 +14,6 @@

 #include <linux/completion.h>

 #include <linux/firmware.h>

 #include <linux/nfc.h>

-#include <linux/platform_data/nxp-nci.h>

 #include <net/nfc/nci_core.h>

diff --git a/include/linux/platform_data/nxp-nci.h b/include/linux/platform_data/nxp-nci.h

deleted file mode 100644

index 97827ad468e2..000000000000

--- a/include/linux/platform_data/nxp-nci.h

+++ /dev/null

@@ -1,19 +0,0 @@

-/* SPDX-License-Identifier: GPL-2.0-only */

-/*

- * Generic platform data for the NXP NCI NFC chips.

- *

- * Copyright (C) 2014  NXP Semiconductors  All rights reserved.

- *

- * Authors: Clément Perrochaud <clement.perrochaud@nxp.com>

- */

-

-#ifndef _NXP_NCI_H_

-#define _NXP_NCI_H_

-

-struct nxp_nci_nfc_platform_data {

-	unsigned int gpio_en;

-	unsigned int gpio_fw;

-	unsigned int irq;

-};

-

-#endif /* _NXP_NCI_H_ */

-- 

2.26.2