From: Sasha Levin Date: Wed, 28 Dec 2022 17:38:24 +0000 (-0500) Subject: Fixes for 5.15 X-Git-Tag: v5.15.86~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3466200565531b0983365fa1976c901d7ffa3df9;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.15 Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/mfd-qcom_rpm-use-devm_of_platform_populate-to-simpli.patch b/queue-5.15/mfd-qcom_rpm-use-devm_of_platform_populate-to-simpli.patch new file mode 100644 index 00000000000..3cd6db48e20 --- /dev/null +++ b/queue-5.15/mfd-qcom_rpm-use-devm_of_platform_populate-to-simpli.patch @@ -0,0 +1,50 @@ +From d8f7afef2793083a700153432b2fb094840fa1d9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 20 Nov 2022 14:01:43 +0100 +Subject: mfd: qcom_rpm: Use devm_of_platform_populate() to simplify code + +From: Christophe JAILLET + +[ Upstream commit e48dee96046246980d476714b3f6684d45f29c13 ] + +Use devm_of_platform_populate() instead of hand-writing it. +This simplifies the code. + +Signed-off-by: Christophe JAILLET +Signed-off-by: Lee Jones +Link: https://lore.kernel.org/r/fd997dc92b9cee219e9c55e22959a94f4bbf570b.1668949256.git.christophe.jaillet@wanadoo.fr +Signed-off-by: Sasha Levin +--- + drivers/mfd/qcom_rpm.c | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/drivers/mfd/qcom_rpm.c b/drivers/mfd/qcom_rpm.c +index ea5eb94427c4..8fea0e511550 100644 +--- a/drivers/mfd/qcom_rpm.c ++++ b/drivers/mfd/qcom_rpm.c +@@ -672,21 +672,11 @@ static int qcom_rpm_probe(struct platform_device *pdev) + if (ret) + dev_warn(&pdev->dev, "failed to mark wakeup irq as wakeup\n"); + +- return of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); +-} +- +-static int qcom_rpm_remove(struct platform_device *pdev) +-{ +- struct qcom_rpm *rpm = dev_get_drvdata(&pdev->dev); +- +- of_platform_depopulate(&pdev->dev); +- +- return 0; ++ return devm_of_platform_populate(&pdev->dev); + } + + static struct platform_driver qcom_rpm_driver = { + .probe = qcom_rpm_probe, +- .remove = qcom_rpm_remove, + .driver = { + .name = "qcom_rpm", + .of_match_table = qcom_rpm_of_match, +-- +2.35.1 + diff --git a/queue-5.15/series b/queue-5.15/series index c581c5143a0..7dd5c837805 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -729,3 +729,4 @@ net-stmmac-fix-errno-when-create_singlethread_workqueue-fails.patch media-dvbdev-fix-build-warning-due-to-comments.patch media-dvbdev-fix-refcnt-bug.patch extcon-usbc-tusb320-call-the-type-c-irq-handler-only-if-a-port-is-registered.patch +mfd-qcom_rpm-use-devm_of_platform_populate-to-simpli.patch