ath11k: use MHI provided APIs to allocate and free MHI controller

Use MHI provided APIs to allocate and free MHI controller to
improve MHI host driver handling. This also fixes a memory leak
as the MHI controller was allocated but never freed.

Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1605634436-36506-1-git-send-email-bbhatt@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c
index 47a1ce1bee4f4e4d52da916662462b03a2f4fb9a..8a2068456a09759dd8df93dc6ca6bfb7bba64422 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mhi.c
+++ b/drivers/net/wireless/ath/ath11k/mhi.c
@@ -214,7 +214,7 @@ int ath11k_mhi_register(struct ath11k_pci *ab_pci)
        struct mhi_controller *mhi_ctrl;
        int ret;
 
-       mhi_ctrl = kzalloc(sizeof(*mhi_ctrl), GFP_KERNEL);
+       mhi_ctrl = mhi_alloc_controller();
        if (!mhi_ctrl)
                return -ENOMEM;
 
@@ -230,7 +230,7 @@ int ath11k_mhi_register(struct ath11k_pci *ab_pci)
        ret = ath11k_mhi_get_msi(ab_pci);
        if (ret) {
                ath11k_err(ab, "failed to get msi for mhi\n");
-               kfree(mhi_ctrl);
+               mhi_free_controller(mhi_ctrl);
                return ret;
        }
 
@@ -248,7 +248,7 @@ int ath11k_mhi_register(struct ath11k_pci *ab_pci)
        ret = mhi_register_controller(mhi_ctrl, &ath11k_mhi_config);
        if (ret) {
                ath11k_err(ab, "failed to register to mhi bus, err = %d\n", ret);
-               kfree(mhi_ctrl);
+               mhi_free_controller(mhi_ctrl);
                return ret;
        }
 
@@ -261,6 +261,7 @@ void ath11k_mhi_unregister(struct ath11k_pci *ab_pci)
 
        mhi_unregister_controller(mhi_ctrl);
        kfree(mhi_ctrl->irq);
+       mhi_free_controller(mhi_ctrl);
 }
 
 static char *ath11k_mhi_state_to_str(enum ath11k_mhi_state mhi_state)