diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2015-09-10 03:18:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-20 22:31:09 -0400 |
commit | 893913822e829f7a37824f6041ff964076374191 (patch) | |
tree | 30ac68e8fdee36be8f7ba8ae619e441ce585f0f8 /drivers/nfc/pn544 | |
parent | 01a14edeaf0456c28e2b9af3afdc0807ec6c20bd (diff) |
mei: bus: complete variable rename of type struct mei_cl_device
In the
commit 5c079ae11921 ("mei: bus: fix drivers and devices names confusion")
we set the variables of type struct mei_cl_device to 'cldev'
but few places were left out, namely mei_cl_bus.h header
and the mei nfc drivers.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nfc/pn544')
-rw-r--r-- | drivers/nfc/pn544/mei.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nfc/pn544/mei.c b/drivers/nfc/pn544/mei.c index 80f897b4a401..2a2c9304e64c 100644 --- a/drivers/nfc/pn544/mei.c +++ b/drivers/nfc/pn544/mei.c | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | #define PN544_DRIVER_NAME "pn544" | 28 | #define PN544_DRIVER_NAME "pn544" |
29 | 29 | ||
30 | static int pn544_mei_probe(struct mei_cl_device *device, | 30 | static int pn544_mei_probe(struct mei_cl_device *cldev, |
31 | const struct mei_cl_device_id *id) | 31 | const struct mei_cl_device_id *id) |
32 | { | 32 | { |
33 | struct nfc_mei_phy *phy; | 33 | struct nfc_mei_phy *phy; |
@@ -35,7 +35,7 @@ static int pn544_mei_probe(struct mei_cl_device *device, | |||
35 | 35 | ||
36 | pr_info("Probing NFC pn544\n"); | 36 | pr_info("Probing NFC pn544\n"); |
37 | 37 | ||
38 | phy = nfc_mei_phy_alloc(device); | 38 | phy = nfc_mei_phy_alloc(cldev); |
39 | if (!phy) { | 39 | if (!phy) { |
40 | pr_err("Cannot allocate memory for pn544 mei phy.\n"); | 40 | pr_err("Cannot allocate memory for pn544 mei phy.\n"); |
41 | return -ENOMEM; | 41 | return -ENOMEM; |
@@ -53,9 +53,9 @@ static int pn544_mei_probe(struct mei_cl_device *device, | |||
53 | return 0; | 53 | return 0; |
54 | } | 54 | } |
55 | 55 | ||
56 | static int pn544_mei_remove(struct mei_cl_device *device) | 56 | static int pn544_mei_remove(struct mei_cl_device *cldev) |
57 | { | 57 | { |
58 | struct nfc_mei_phy *phy = mei_cl_get_drvdata(device); | 58 | struct nfc_mei_phy *phy = mei_cl_get_drvdata(cldev); |
59 | 59 | ||
60 | pr_info("Removing pn544\n"); | 60 | pr_info("Removing pn544\n"); |
61 | 61 | ||