slimbus: ngd: get drvdata from correct device
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>alistair/sunxi64-5.8
parent
0c6b20a1d7
commit
b58c663059
|
@ -1361,7 +1361,6 @@ static int of_qcom_slim_ngd_register(struct device *parent,
|
||||||
ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME;
|
ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME;
|
||||||
ngd->pdev->dev.of_node = node;
|
ngd->pdev->dev.of_node = node;
|
||||||
ctrl->ngd = ngd;
|
ctrl->ngd = ngd;
|
||||||
platform_set_drvdata(ngd->pdev, ctrl);
|
|
||||||
|
|
||||||
platform_device_add(ngd->pdev);
|
platform_device_add(ngd->pdev);
|
||||||
ngd->base = ctrl->base + ngd->id * data->offset +
|
ngd->base = ctrl->base + ngd->id * data->offset +
|
||||||
|
@ -1376,12 +1375,13 @@ static int of_qcom_slim_ngd_register(struct device *parent,
|
||||||
|
|
||||||
static int qcom_slim_ngd_probe(struct platform_device *pdev)
|
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 device *dev = &pdev->dev;
|
||||||
|
struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev->parent);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ctrl->ctrl.dev = dev;
|
ctrl->ctrl.dev = dev;
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, ctrl);
|
||||||
pm_runtime_use_autosuspend(dev);
|
pm_runtime_use_autosuspend(dev);
|
||||||
pm_runtime_set_autosuspend_delay(dev, QCOM_SLIM_NGD_AUTOSUSPEND);
|
pm_runtime_set_autosuspend_delay(dev, QCOM_SLIM_NGD_AUTOSUSPEND);
|
||||||
pm_runtime_set_suspended(dev);
|
pm_runtime_set_suspended(dev);
|
||||||
|
|
Loading…
Reference in New Issue