From mboxrd@z Thu Jan 1 00:00:00 1970 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 722D938837E for ; Wed, 17 Jun 2026 21:51:01 +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=1781733062; cv=none; b=Q3eMELrrJqG4kYSIxVaceFPR7F/UYLoktIT+q2skt2/RXdTwlnwtBOJ1wf9H/9EvRDzyWc1GZGEvhB+dSJqfOULKdMJD21nVQsqxHAh4sf7GbfK7zISuQI0LnF0fQUOKqr/I2IKzj7i/RJHYIi4noiCF0Dw6PpecpUoy/6C7tUU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781733062; c=relaxed/simple; bh=gsCFNQWXxZO05cXlRvJoA9bV814EuMVcI/XZ7DaN1oI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OBG6my+ekRrvJy51FKU/ULbzZMN3jLtidAtVGcls4VHMqC0SiK9yNvGdbtsEeJ2V6/vQ7y5rVwbmQQSUBoFjauIs51tzLfzoSniU3x9Gf4weDSic8KI3lJ2x/e+UiJvvuZkKwrv8GxgkXF67/ER56ciOz6kFVbjEPU2RJ7qz0to= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ijjfICJS; 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="ijjfICJS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 699871F00A3D; Wed, 17 Jun 2026 21:51:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781733061; bh=FHU4BpbIvLRmync9kvQzRz3TL7u+wkQkJE+80yojLKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ijjfICJSgsmpCO7xxPfAfEFiFHOwDnHzEJ1+NL5OISMCxDd6pRRm0x++2eUS8XhGj zvHOlCmGuCbHKvx1yxJ0+QRYeMKJU2WMzus1HIhauUoCg1Hjesu+vh4Bzo5TULialv RzgtykyXJ7spSZG5p3DLVhJD7lTscskXGFSN+3ocCJvs/oJleCeTPiZ2bSI8C8TOtP v9FezGyyxyNmORCtg+xJ2YtJTdS+Pz72uP+b6acdLg12gTChjY+zeXEsX+CV66M13W XVO/aBin9+lqxpXsmYbkaJpBfbjIQCuUDHV+7rMuLwZ9DZKuX+Eucs2EUJw9tFBrt/ fVR/KcHruqvTQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Bjorn Andersson , Dmitry Baryshkov , Mukesh Ojha , Srinivas Kandagatla , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 5.15.y 2/4] slimbus: qcom-ngd-ctrl: Fix up platform_driver registration Date: Wed, 17 Jun 2026 17:50:56 -0400 Message-ID: <20260617215058.418058-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260617215058.418058-1-sashal@kernel.org> References: <2026061509-identical-efficient-87fe@gregkh> <20260617215058.418058-1-sashal@kernel.org> 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 Stable-dep-of: 2a9d50e9ea40 ("slimbus: qcom-ngd-ctrl: Register callbacks after creating the ngd") 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 4f939455f039cd..a62b15c0e3a3cd 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1474,6 +1474,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; @@ -1583,7 +1590,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: @@ -1597,7 +1603,9 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) static void 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); } static void qcom_slim_ngd_remove(struct platform_device *pdev) @@ -1673,6 +1681,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