From 9c664d57f2dd907ccdd7e9876611f3bf1d2b987b Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 28 Dec 2022 12:38:23 -0500 Subject: [PATCH] Fixes for 6.0 Signed-off-by: Sasha Levin --- ...-devm_of_platform_populate-to-simpli.patch | 50 +++++++++++++++++++ queue-6.0/series | 1 + 2 files changed, 51 insertions(+) create mode 100644 queue-6.0/mfd-qcom_rpm-use-devm_of_platform_populate-to-simpli.patch diff --git a/queue-6.0/mfd-qcom_rpm-use-devm_of_platform_populate-to-simpli.patch b/queue-6.0/mfd-qcom_rpm-use-devm_of_platform_populate-to-simpli.patch new file mode 100644 index 00000000000..83dfb671ab6 --- /dev/null +++ b/queue-6.0/mfd-qcom_rpm-use-devm_of_platform_populate-to-simpli.patch @@ -0,0 +1,50 @@ +From 8893ed47cf3bfb742a9c0d21cfc3f22a6c4d436b 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-6.0/series b/queue-6.0/series index 1f1fe27ac5d..51188a0b852 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -1071,3 +1071,4 @@ cifs-fix-double-fault-crash-during-ntlmssp.patch cifs-fix-xid-leak-in-cifs_get_file_info_unix.patch cifs-fix-memory-leaks-in-session-setup.patch cifs-fix-use-after-free-on-the-link-name.patch +mfd-qcom_rpm-use-devm_of_platform_populate-to-simpli.patch -- 2.47.3