mei: bus: use mei_cldev_ prefix for the API functions

[firefly-linux-kernel-4.4.55.git] / drivers / nfc / mei_phy.c

diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c
index ecd2a0dce797879706baa46e0c1741827d235110..83deda4bb4d6d52d4b529b71712f71114aac1445 100644 (file)
--- a/drivers/nfc/mei_phy.c
+++ b/drivers/nfc/mei_phy.c
@@ -118,7 +118,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy)
        cmd.sub_command = MEI_NFC_SUBCMD_IF_VERSION;
 
        MEI_DUMP_NFC_HDR("version", &cmd.hdr);
-       r = mei_cl_send(phy->cldev, (u8 *)&cmd, sizeof(struct mei_nfc_cmd));
+       r = mei_cldev_send(phy->cldev, (u8 *)&cmd, sizeof(struct mei_nfc_cmd));
        if (r < 0) {
                pr_err("Could not send IF version cmd\n");
                return r;
@@ -132,7 +132,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy)
        if (!reply)
                return -ENOMEM;
 
-       bytes_recv = mei_cl_recv(phy->cldev, (u8 *)reply, if_version_length);
+       bytes_recv = mei_cldev_recv(phy->cldev, (u8 *)reply, if_version_length);
        if (bytes_recv < 0 || bytes_recv < sizeof(struct mei_nfc_reply)) {
                pr_err("Could not read IF version\n");
                r = -EIO;
@@ -186,13 +186,14 @@ static int mei_nfc_connect(struct nfc_mei_phy *phy)
        connect->vendor_id = phy->vendor_id;
 
        MEI_DUMP_NFC_HDR("connect request", &cmd->hdr);
-       r = mei_cl_send(phy->cldev, (u8 *)cmd, connect_length);
+       r = mei_cldev_send(phy->cldev, (u8 *)cmd, connect_length);
        if (r < 0) {
                pr_err("Could not send connect cmd %d\n", r);
                goto err;
        }
 
-       bytes_recv = mei_cl_recv(phy->cldev, (u8 *)reply, connect_resp_length);
+       bytes_recv = mei_cldev_recv(phy->cldev, (u8 *)reply,
+                                   connect_resp_length);
        if (bytes_recv < 0) {
                r = bytes_recv;
                pr_err("Could not read connect response %d\n", r);
@@ -238,7 +239,7 @@ static int mei_nfc_send(struct nfc_mei_phy *phy, u8 *buf, size_t length)
        MEI_DUMP_NFC_HDR("send", hdr);
 
        memcpy(mei_buf + MEI_NFC_HEADER_SIZE, buf, length);
-       err = mei_cl_send(phy->cldev, mei_buf, length + MEI_NFC_HEADER_SIZE);
+       err = mei_cldev_send(phy->cldev, mei_buf, length + MEI_NFC_HEADER_SIZE);
        if (err < 0)
                goto out;
 
@@ -278,7 +279,7 @@ static int mei_nfc_recv(struct nfc_mei_phy *phy, u8 *buf, size_t length)
        struct mei_nfc_hdr *hdr;
        int received_length;
 
-       received_length = mei_cl_recv(phy->cldev, buf, length);
+       received_length = mei_cldev_recv(phy->cldev, buf, length);
        if (received_length < 0)
                return received_length;
 
@@ -337,7 +338,7 @@ static int nfc_mei_phy_enable(void *phy_id)
        if (phy->powered == 1)
                return 0;
 
-       r = mei_cl_enable_device(phy->cldev);
+       r = mei_cldev_enable(phy->cldev);
        if (r < 0) {
                pr_err("Could not enable device %d\n", r);
                return r;
@@ -355,7 +356,7 @@ static int nfc_mei_phy_enable(void *phy_id)
                goto err;
        }
 
-       r = mei_cl_register_event_cb(phy->cldev, BIT(MEI_CL_EVENT_RX),
+       r = mei_cldev_register_event_cb(phy->cldev, BIT(MEI_CL_EVENT_RX),
                                     nfc_mei_event_cb, phy);
        if (r) {
                pr_err("Event cb registration failed %d\n", r);
@@ -368,7 +369,7 @@ static int nfc_mei_phy_enable(void *phy_id)
 
 err:
        phy->powered = 0;
-       mei_cl_disable_device(phy->cldev);
+       mei_cldev_disable(phy->cldev);
        return r;
 }
 
@@ -378,7 +379,7 @@ static void nfc_mei_phy_disable(void *phy_id)
 
        pr_info("%s\n", __func__);
 
-       mei_cl_disable_device(phy->cldev);
+       mei_cldev_disable(phy->cldev);
 
        phy->powered = 0;
 }
@@ -400,7 +401,7 @@ struct nfc_mei_phy *nfc_mei_phy_alloc(struct mei_cl_device *cldev)
 
        phy->cldev = cldev;
        init_waitqueue_head(&phy->send_wq);
-       mei_cl_set_drvdata(cldev, phy);
+       mei_cldev_set_drvdata(cldev, phy);
 
        return phy;
 }
@@ -408,7 +409,7 @@ EXPORT_SYMBOL_GPL(nfc_mei_phy_alloc);
 
 void nfc_mei_phy_free(struct nfc_mei_phy *phy)
 {
-       mei_cl_disable_device(phy->cldev);
+       mei_cldev_disable(phy->cldev);
        kfree(phy);
 }
 EXPORT_SYMBOL_GPL(nfc_mei_phy_free);