| From 92cfd217c031de9cf8daa0b0ca911c8ad5fbf99b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 16 Sep 2018 16:45:46 -0700 |
| Subject: slimbus: ngd: register ngd driver only once. |
| |
| From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> |
| |
| [ Upstream commit 1830dad34c070161fda2ff1db77b39ffa78aa380 ] |
| |
| Move ngd platform driver out of loop so that it registers only once. |
| |
| Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/slimbus/qcom-ngd-ctrl.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c |
| index f63d1b8a09335..a9abde2f4088b 100644 |
| --- a/drivers/slimbus/qcom-ngd-ctrl.c |
| +++ b/drivers/slimbus/qcom-ngd-ctrl.c |
| @@ -1346,7 +1346,6 @@ static int of_qcom_slim_ngd_register(struct device *parent, |
| ngd->base = ctrl->base + ngd->id * data->offset + |
| (ngd->id - 1) * data->size; |
| ctrl->ngd = ngd; |
| - platform_driver_register(&qcom_slim_ngd_driver); |
| |
| return 0; |
| } |
| @@ -1445,6 +1444,7 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) |
| init_completion(&ctrl->reconf); |
| init_completion(&ctrl->qmi.qmi_comp); |
| |
| + platform_driver_register(&qcom_slim_ngd_driver); |
| return of_qcom_slim_ngd_register(dev, ctrl); |
| } |
| |
| -- |
| 2.20.1 |
| |
