Skip to content

Commit

Permalink
NFC: microread: Drop platform data header file
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jdelvare authored and Samuel Ortiz committed Mar 9, 2016
1 parent dd21543 commit 87aca73
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 44 deletions.
1 change: 0 additions & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions drivers/nfc/microread/i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
35 changes: 0 additions & 35 deletions include/linux/platform_data/microread.h

This file was deleted.

0 comments on commit 87aca73

Please sign in to comment.