Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D6BE30EF6C for ; Wed, 17 Jun 2026 19:24:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781724286; cv=none; b=lE36AP68Yj2Q1Mz0l6wdd6QkZlTQZo8CrqZ+0Fid5eK4IkujCOT6xR1BWXP57U8itoNEgTjh9gAkLxPs3h6idJMsQY0ddU/CyNthWI1EFwL8fCc1lPyBe45qfDwXD6F8WuA4PsFOS9eTq59kMrrdX2eAkgvlLTU4gN6uHDr82ys= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781724286; c=relaxed/simple; bh=byOZliA7wCh2t3B67e2sA6IUQEqhlCgpgg2p5ra3t/E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XmdybSOzsr1XXUshdFyrf9zT0EwJ0oTgkwUNMNBuKzYwYrK+ePSxU88LqyE8yJ9AUTIrBj/DpI+SmHJQkxJtFu49gP+qMPZe5QJP4Y0+x9lkH5hotPxY4xTucyXStV4Wu58U0fe+0OmdpjeB/Y13L04jeJ61iwshmTVkJjZO1aU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DWmPvGve; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DWmPvGve" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EF801F000E9; Wed, 17 Jun 2026 19:24:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781724285; bh=NdWWaYSnb/U09xcZbcuJ1gWhwVkRXpZ5OAlLh5MpcPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DWmPvGvedxf+bfaQa7013Al+FvXWlE2w1D7mEKU1kTSBdoJRvmugQSGeBjRg/aJfg lNDX9PX267i0vtjx6vCbSEuH8ZJGbFiZRSoTRTp7LEulO+kvw55Bpbm43sV2ryowJf ikMPwYT4LYsEsEp+wSPmy3oGfPvHH3gXtbJFuWt71Zqu7arIgWVkzzlTJCs5F27Xf7 3V8q9wQdZMpZfHvSYnmQnH5sFSfRQBJpQYuZ4M7N0czjj5IuzlJ+ecCDiP6bB7bAip 0WpalPdiUzt4UJmrZsIoq60v4li0zoqZkb1ievrqOot2M3R6ptjRwtnF9KPXf9owqG 2DDnlgGANRb7A== From: Sasha Levin To: stable@vger.kernel.org Cc: Bjorn Andersson , Dmitry Baryshkov , Mukesh Ojha , Srinivas Kandagatla , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1.y] slimbus: qcom-ngd-ctrl: Fix up platform_driver registration Date: Wed, 17 Jun 2026 15:24:42 -0400 Message-ID: <20260617192442.296528-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026061519-vest-submerge-1c40@gregkh> References: <2026061519-vest-submerge-1c40@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Bjorn Andersson [ Upstream commit 8663e8334d7b6007f5d8a4e5dd270246f35107a6 ] Device drivers should not invoke platform_driver_register()/unregister() in their probe and remove paths. They should further not rely on platform_driver_unregister() as their only means of "deleting" their child devices. Introduce a helper to unregister the child device and move the platform_driver_register()/unregister() to module_init()/exit(). Fixes: 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver") Cc: stable@vger.kernel.org Reviewed-by: Dmitry Baryshkov Reviewed-by: Mukesh Ojha Signed-off-by: Bjorn Andersson Signed-off-by: Srinivas Kandagatla Link: https://patch.msgid.link/20260530204421.116824-3-srini@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/slimbus/qcom-ngd-ctrl.c | 36 ++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 3fa245a472b2ee..da8bffe6df5de3 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1491,6 +1491,13 @@ static int of_qcom_slim_ngd_register(struct device *parent, return -ENODEV; } +static void qcom_slim_ngd_unregister(struct qcom_slim_ngd_ctrl *ctrl) +{ + struct qcom_slim_ngd *ngd = ctrl->ngd; + + platform_device_del(ngd->pdev); +} + static int qcom_slim_ngd_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1595,7 +1602,6 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) goto err_pdr_lookup; } - platform_driver_register(&qcom_slim_ngd_driver); return of_qcom_slim_ngd_register(dev, ctrl); err_pdr_alloc: @@ -1609,7 +1615,9 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) static int qcom_slim_ngd_ctrl_remove(struct platform_device *pdev) { - platform_driver_unregister(&qcom_slim_ngd_driver); + struct qcom_slim_ngd_ctrl *ctrl = platform_get_drvdata(pdev); + + qcom_slim_ngd_unregister(ctrl); return 0; } @@ -1688,6 +1696,28 @@ static struct platform_driver qcom_slim_ngd_driver = { }, }; -module_platform_driver(qcom_slim_ngd_ctrl_driver); +static int qcom_slim_ngd_init(void) +{ + int ret; + + ret = platform_driver_register(&qcom_slim_ngd_driver); + if (ret) + return ret; + + ret = platform_driver_register(&qcom_slim_ngd_ctrl_driver); + if (ret) + platform_driver_unregister(&qcom_slim_ngd_driver); + + return ret; +} + +static void qcom_slim_ngd_exit(void) +{ + platform_driver_unregister(&qcom_slim_ngd_ctrl_driver); + platform_driver_unregister(&qcom_slim_ngd_driver); +} + +module_init(qcom_slim_ngd_init); +module_exit(qcom_slim_ngd_exit); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("Qualcomm SLIMBus NGD controller"); -- 2.53.0