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/microread/mei.c | |
| 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/microread/mei.c')
| -rw-r--r-- | drivers/nfc/microread/mei.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c index 93328bd45110..994871c02b7b 100644 --- a/drivers/nfc/microread/mei.c +++ b/drivers/nfc/microread/mei.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #define MICROREAD_DRIVER_NAME "microread" | 30 | #define MICROREAD_DRIVER_NAME "microread" |
| 31 | 31 | ||
| 32 | static int microread_mei_probe(struct mei_cl_device *device, | 32 | static int microread_mei_probe(struct mei_cl_device *cldev, |
| 33 | const struct mei_cl_device_id *id) | 33 | const struct mei_cl_device_id *id) |
| 34 | { | 34 | { |
| 35 | struct nfc_mei_phy *phy; | 35 | struct nfc_mei_phy *phy; |
| @@ -37,7 +37,7 @@ static int microread_mei_probe(struct mei_cl_device *device, | |||
| 37 | 37 | ||
| 38 | pr_info("Probing NFC microread\n"); | 38 | pr_info("Probing NFC microread\n"); |
| 39 | 39 | ||
| 40 | phy = nfc_mei_phy_alloc(device); | 40 | phy = nfc_mei_phy_alloc(cldev); |
| 41 | if (!phy) { | 41 | if (!phy) { |
| 42 | pr_err("Cannot allocate memory for microread mei phy.\n"); | 42 | pr_err("Cannot allocate memory for microread mei phy.\n"); |
| 43 | return -ENOMEM; | 43 | return -ENOMEM; |
| @@ -55,9 +55,9 @@ static int microread_mei_probe(struct mei_cl_device *device, | |||
| 55 | return 0; | 55 | return 0; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | static int microread_mei_remove(struct mei_cl_device *device) | 58 | static int microread_mei_remove(struct mei_cl_device *cldev) |
| 59 | { | 59 | { |
| 60 | struct nfc_mei_phy *phy = mei_cl_get_drvdata(device); | 60 | struct nfc_mei_phy *phy = mei_cl_get_drvdata(cldev); |
| 61 | 61 | ||
| 62 | microread_remove(phy->hdev); | 62 | microread_remove(phy->hdev); |
| 63 | 63 | ||