summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/microread/mei.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2015-09-10 09:18:05 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-09-21 04:31:10 +0200
commitd49dc5e76fc917e5dfef76cb56fe3b3868deed5d (patch)
tree2b1a074aca8d31ce13dbccaf5dea0c7675cd4dfe /drivers/nfc/microread/mei.c
parentmei: bus: complete variable rename of type struct mei_cl_device (diff)
downloadlinux-d49dc5e76fc917e5dfef76cb56fe3b3868deed5d.tar.xz
linux-d49dc5e76fc917e5dfef76cb56fe3b3868deed5d.zip
mei: bus: use mei_cldev_ prefix for the API functions
Use mei_cldev_ prefix for all mei client bus api functions in order to resolve prefix conflict with functions that handle client function and are defined in client.c 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c
index 994871c02b7b..3092501f26c4 100644
--- a/drivers/nfc/microread/mei.c
+++ b/drivers/nfc/microread/mei.c
@@ -57,7 +57,7 @@ static int microread_mei_probe(struct mei_cl_device *cldev,
static int microread_mei_remove(struct mei_cl_device *cldev)
{
- struct nfc_mei_phy *phy = mei_cl_get_drvdata(cldev);
+ struct nfc_mei_phy *phy = mei_cldev_get_drvdata(cldev);
microread_remove(phy->hdev);
@@ -88,7 +88,7 @@ static int microread_mei_init(void)
pr_debug(DRIVER_DESC ": %s\n", __func__);
- r = mei_cl_driver_register(&microread_driver);
+ r = mei_cldev_driver_register(&microread_driver);
if (r) {
pr_err(MICROREAD_DRIVER_NAME ": driver registration failed\n");
return r;
@@ -99,7 +99,7 @@ static int microread_mei_init(void)
static void microread_mei_exit(void)
{
- mei_cl_driver_unregister(&microread_driver);
+ mei_cldev_driver_unregister(&microread_driver);
}
module_init(microread_mei_init);