A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "clk: qcom: clk-aop-qmp: pass mbox pointer by reference in qmp_update_client"

Browse source
This commit is contained in:
qctecmdr 2019-09-05 14:18:50 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8e92de522d
1 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
drivers/clk/qcom/clk-aop-qmp.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2017, The Linux Foundation. All rights reserved.
* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
*/
#define pr_fmt(fmt) "%s: " fmt, __func__
@ -222,7 +222,7 @@ static struct clk_hw *aop_qmp_clk_hws[] = {
};
static int qmp_update_client(struct clk_hw *hw, struct device *dev,
struct mbox_chan *mbox)
struct mbox_chan **mbox)
{
struct clk_aop_qmp *clk_aop = to_aop_qmp_clk(hw);
int ret;
@ -233,13 +233,13 @@ static int qmp_update_client(struct clk_hw *hw, struct device *dev,
clk_aop->cl.tx_tout = MBOX_TOUT_MS;
clk_aop->cl.knows_txdone = false;
if (mbox) {
clk_aop->mbox = mbox;
if (*mbox) {
clk_aop->mbox = *mbox;
return 0;
}
/* Allocate mailbox channel */
mbox = clk_aop->mbox = mbox_request_channel(&clk_aop->cl, 0);
*mbox = clk_aop->mbox = mbox_request_channel(&clk_aop->cl, 0);
if (IS_ERR(clk_aop->mbox)) {
ret = PTR_ERR(clk_aop->mbox);
if (ret != -EPROBE_DEFER)
@ -256,6 +256,7 @@ static int aop_qmp_clk_probe(struct platform_device *pdev)
struct clk *clk = NULL;
struct device_node *np = pdev->dev.of_node;
struct mbox_chan *mbox = NULL;
struct clk_onecell_data *clk_data;
int num_clks = ARRAY_SIZE(aop_qmp_clk_hws);
int ret = 0, i = 0;
@ -263,14 +264,25 @@ static int aop_qmp_clk_probe(struct platform_device *pdev)
* Allocate mbox channel for the first clock client. The same channel
* would be used for the rest of the clock clients.
*/
ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, mbox);
ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, &mbox);
if (ret < 0)
return ret;
clk_data = devm_kzalloc(&pdev->dev, sizeof(*clk_data), GFP_KERNEL);
if (!clk_data)
return -ENOMEM;
clk_data->clks = devm_kcalloc(&pdev->dev, num_clks,
sizeof(*clk_data->clks), GFP_KERNEL);
if (!clk_data->clks)
return -ENOMEM;
clk_data->clk_num = num_clks;
for (i = 1; i < num_clks; i++) {
if (!aop_qmp_clk_hws[i])
continue;
ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, mbox);
ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, &mbox);
if (ret < 0) {
dev_err(&pdev->dev, "Failed to update QMP client %d\n",
ret);
@ -289,14 +301,16 @@ static int aop_qmp_clk_probe(struct platform_device *pdev)
for (i = 0; i < num_clks; i++) {
if (!aop_qmp_clk_hws[i])
continue;
clk = devm_clk_register(&pdev->dev, aop_qmp_clk_hws[i]);
if (IS_ERR(clk)) {
ret = PTR_ERR(clk);
goto fail;
}
clk_data->clks[i] = clk;
}
ret = of_clk_add_provider(np, of_clk_src_simple_get, clk);
ret = of_clk_add_provider(np, of_clk_src_onecell_get, clk_data);
if (ret) {
dev_err(&pdev->dev, "Failed to register clock provider\n");
goto fail;