summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/mei_phy.h
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2015-09-10 09:18:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-09-21 04:31:09 +0200
commit893913822e829f7a37824f6041ff964076374191 (patch)
tree30ac68e8fdee36be8f7ba8ae619e441ce585f0f8 /drivers/nfc/mei_phy.h
parentmei: bus: export mei_cldev_enabled function (diff)
downloadlinux-893913822e829f7a37824f6041ff964076374191.tar.xz
linux-893913822e829f7a37824f6041ff964076374191.zip
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/mei_phy.h')
-rw-r--r--drivers/nfc/mei_phy.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/mei_phy.h b/drivers/nfc/mei_phy.h
index fbfa3e61738f..acd3a1fc69e6 100644
--- a/drivers/nfc/mei_phy.h
+++ b/drivers/nfc/mei_phy.h
@@ -13,7 +13,7 @@
/**
* struct nfc_mei_phy
*
- * @device: mei device
+ * @cldev: mei client device
* @hdev: nfc hci device
* @send_wq: send completion wait queue
@@ -28,7 +28,7 @@
* and prevents normal operation.
*/
struct nfc_mei_phy {
- struct mei_cl_device *device;
+ struct mei_cl_device *cldev;
struct nfc_hci_dev *hdev;
wait_queue_head_t send_wq;