slimbus: ngd: get drvdata from correct device

[ Upstream commit b58c663059b484f7ff547d076a34cf6d7a302e56 ]

Get drvdata directly from parent instead of ngd dev, as ngd
dev can probe defer and previously set drvdata will become null.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200417093618.7929-1-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index 29fbab5..01a17d8 100644 (file)
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -1354,7 +1354,6 @@ static int of_qcom_slim_ngd_register(struct device *parent,
                ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME;
                ngd->pdev->dev.of_node = node;
                ctrl->ngd = ngd;
-               platform_set_drvdata(ngd->pdev, ctrl);
 
                platform_device_add(ngd->pdev);
                ngd->base = ctrl->base + ngd->id * data->offset +
@@ -1369,12 +1368,13 @@ static int of_qcom_slim_ngd_register(struct device *parent,
 
 static int qcom_slim_ngd_probe(struct platform_device *pdev)
 {
-       struct qcom_slim_ngd_ctrl *ctrl = platform_get_drvdata(pdev);
        struct device *dev = &pdev->dev;
+       struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev->parent);
        int ret;
 
        ctrl->ctrl.dev = dev;
 
+       platform_set_drvdata(pdev, ctrl);
        pm_runtime_use_autosuspend(dev);
        pm_runtime_set_autosuspend_delay(dev, QCOM_SLIM_NGD_AUTOSUSPEND);
        pm_runtime_set_suspended(dev);