aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2016-01-21 03:20:12 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2016-03-09 17:25:45 -0500
commit87aca73737e379f079993802d2c43606f7c5d26c (patch)
treebf0fa8b0151c225694656331505ba5ba26a3f1eb
parentdd215430dc9132fc0505cb4d5aa6dc6243ce8f9c (diff)
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>
-rw-r--r--MAINTAINERS1
-rw-r--r--drivers/nfc/microread/i2c.c8
-rw-r--r--include/linux/platform_data/microread.h35
3 files changed, 0 insertions, 44 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 355e1c85bad6..5e4e50ff87bb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7644,7 +7644,6 @@ F: net/nfc/
7644F: include/net/nfc/ 7644F: include/net/nfc/
7645F: include/uapi/linux/nfc.h 7645F: include/uapi/linux/nfc.h
7646F: drivers/nfc/ 7646F: drivers/nfc/
7647F: include/linux/platform_data/microread.h
7648F: include/linux/platform_data/nfcmrvl.h 7647F: include/linux/platform_data/nfcmrvl.h
7649F: include/linux/platform_data/nxp-nci.h 7648F: include/linux/platform_data/nxp-nci.h
7650F: include/linux/platform_data/pn544.h 7649F: include/linux/platform_data/pn544.h
diff --git a/drivers/nfc/microread/i2c.c b/drivers/nfc/microread/i2c.c
index 918e8f2eac47..e0e8afd27849 100644
--- 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,
246 const struct i2c_device_id *id) 246 const struct i2c_device_id *id)
247{ 247{
248 struct microread_i2c_phy *phy; 248 struct microread_i2c_phy *phy;
249 struct microread_nfc_platform_data *pdata =
250 dev_get_platdata(&client->dev);
251 int r; 249 int r;
252 250
253 dev_dbg(&client->dev, "client %p\n", client); 251 dev_dbg(&client->dev, "client %p\n", client);
254 252
255 if (!pdata) {
256 nfc_err(&client->dev, "client %p: missing platform data\n",
257 client);
258 return -EINVAL;
259 }
260
261 phy = devm_kzalloc(&client->dev, sizeof(struct microread_i2c_phy), 253 phy = devm_kzalloc(&client->dev, sizeof(struct microread_i2c_phy),
262 GFP_KERNEL); 254 GFP_KERNEL);
263 if (!phy) 255 if (!phy)
diff --git a/include/linux/platform_data/microread.h b/include/linux/platform_data/microread.h
deleted file mode 100644
index ca13992089b8..000000000000
--- a/include/linux/platform_data/microread.h
+++ /dev/null
@@ -1,35 +0,0 @@
1/*
2 * Driver include for the Inside Secure microread NFC Chip.
3 *
4 * Copyright (C) 2011 Tieto Poland
5 * Copyright (C) 2012 Intel Corporation. All rights reserved.
6 *
7 * This program is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU General Public License
9 * version 2 as published by the Free Software Foundation.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 */
20
21#ifndef _MICROREAD_H
22#define _MICROREAD_H
23
24#include <linux/i2c.h>
25
26#define MICROREAD_DRIVER_NAME "microread"
27
28/* board config platform data for microread */
29struct microread_nfc_platform_data {
30 unsigned int rst_gpio;
31 unsigned int irq_gpio;
32 unsigned int ioh_gpio;
33};
34
35#endif /* _MICROREAD_H */