NFC: microread: Drop platform data header file

Originally I only wanted to drop the unneeded inclusion of
<linux/i2c.h>, but then noticed that struct
microread_nfc_platform_data isn't actually used, and
MICROREAD_DRIVER_NAME is redefined in the only file where it is used,
so we can get rid of the header file and dead code altogether.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
Cc: Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 355e1c8..5e4e50f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7644,7 +7644,6 @@ F:        net/nfc/
 F:     include/net/nfc/
 F:     include/uapi/linux/nfc.h
 F:     drivers/nfc/
-F:     include/linux/platform_data/microread.h
 F:     include/linux/platform_data/nfcmrvl.h
 F:     include/linux/platform_data/nxp-nci.h
 F:     include/linux/platform_data/pn544.h

diff --git a/drivers/nfc/microread/i2c.c b/drivers/nfc/microread/i2c.c
index 918e8f2..e0e8afd 100644 (file)
--- a/drivers/nfc/microread/i2c.c
+++ b/drivers/nfc/microread/i2c.c
@@ -246,18 +246,10 @@ static int microread_i2c_probe(struct i2c_client *client,
                               const struct i2c_device_id *id)
 {
        struct microread_i2c_phy *phy;
-       struct microread_nfc_platform_data *pdata =
-               dev_get_platdata(&client->dev);
        int r;
 
        dev_dbg(&client->dev, "client %p\n", client);
 
-       if (!pdata) {
-               nfc_err(&client->dev, "client %p: missing platform data\n",
-                       client);
-               return -EINVAL;
-       }
-
        phy = devm_kzalloc(&client->dev, sizeof(struct microread_i2c_phy),
                           GFP_KERNEL);
        if (!phy)

diff --git a/include/linux/platform_data/microread.h b/include/linux/platform_data/microread.h
deleted file mode 100644 (file)
index ca13992..0000000
--- a/include/linux/platform_data/microread.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Driver include for the Inside Secure microread NFC Chip.
- *
- * Copyright (C) 2011 Tieto Poland
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef _MICROREAD_H
-#define _MICROREAD_H
-
-#include <linux/i2c.h>
-
-#define MICROREAD_DRIVER_NAME  "microread"
-
-/* board config platform data for microread */
-struct microread_nfc_platform_data {
-       unsigned int rst_gpio;
-       unsigned int irq_gpio;
-       unsigned int ioh_gpio;
-};
-
-#endif /* _MICROREAD_H */