From: Sasha Levin Date: Mon, 17 Oct 2022 09:38:34 +0000 (-0400) Subject: Drop phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch X-Git-Tag: v5.4.219~31^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27e7779366b4f9f117b5cbe104ebea076f318fc3;p=thirdparty%2Fkernel%2Fstable-queue.git Drop phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch b/queue-5.10/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch deleted file mode 100644 index 265b87ba73d..00000000000 --- a/queue-5.10/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5b35a2e119083cddd0e476946d63eb12ac862804 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Sep 2022 13:07:13 +0200 -Subject: phy: qcom-qmp-combo: disable runtime PM on unbind - -From: Johan Hovold - -[ Upstream commit 4382d518d1887e62234560ea08a0203d11d28cc1 ] - -Make sure to disable runtime PM also on driver unbind. - -Fixes: ac0d239936bd ("phy: qcom-qmp: Add support for runtime PM"). -Signed-off-by: Johan Hovold -Reviewed-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20220907110728.19092-2-johan+linaro@kernel.org -Signed-off-by: Vinod Koul -Signed-off-by: Sasha Levin ---- - drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -index c7309e981bfb..dcf8a8764e17 100644 ---- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -@@ -6273,7 +6273,9 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) - return -ENOMEM; - - pm_runtime_set_active(dev); -- pm_runtime_enable(dev); -+ ret = devm_pm_runtime_enable(dev); -+ if (ret) -+ return ret; - /* - * Prevent runtime pm from being ON by default. Users can enable - * it using power/control in sysfs. -@@ -6323,13 +6325,10 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) - phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); - if (!IS_ERR(phy_provider)) - dev_info(dev, "Registered Qcom-QMP phy\n"); -- else -- pm_runtime_disable(dev); - - return PTR_ERR_OR_ZERO(phy_provider); - - err_node_put: -- pm_runtime_disable(dev); - of_node_put(child); - return ret; - } --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index b1cb08e7546..2ae1cae65e0 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -240,7 +240,6 @@ dyndbg-drop-exported-dynamic_debug_exec_queries.patch sbitmap-avoid-leaving-waitqueue-in-invalid-state-in-.patch mtd-devices-docg3-check-the-return-value-of-devm_ior.patch phy-qcom-qmp-create-copies-of-qmp-phy-driver.patch -phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch phy-qcom-qmp-usb-disable-runtime-pm-on-unbind.patch phy-qcom-qmp-pcie-msm8996-drop-all-compatibles-excep.patch phy-qcom-qmp-pcie-change-symbol-prefix-to-qcom_qmp_p.patch diff --git a/queue-5.15/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch b/queue-5.15/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch deleted file mode 100644 index 92fdf9312c7..00000000000 --- a/queue-5.15/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f3aca84b69977d7c024d9fbf52163de4b852df22 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Sep 2022 13:07:13 +0200 -Subject: phy: qcom-qmp-combo: disable runtime PM on unbind - -From: Johan Hovold - -[ Upstream commit 4382d518d1887e62234560ea08a0203d11d28cc1 ] - -Make sure to disable runtime PM also on driver unbind. - -Fixes: ac0d239936bd ("phy: qcom-qmp: Add support for runtime PM"). -Signed-off-by: Johan Hovold -Reviewed-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20220907110728.19092-2-johan+linaro@kernel.org -Signed-off-by: Vinod Koul -Signed-off-by: Sasha Levin ---- - drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -index c7309e981bfb..dcf8a8764e17 100644 ---- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -@@ -6273,7 +6273,9 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) - return -ENOMEM; - - pm_runtime_set_active(dev); -- pm_runtime_enable(dev); -+ ret = devm_pm_runtime_enable(dev); -+ if (ret) -+ return ret; - /* - * Prevent runtime pm from being ON by default. Users can enable - * it using power/control in sysfs. -@@ -6323,13 +6325,10 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) - phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); - if (!IS_ERR(phy_provider)) - dev_info(dev, "Registered Qcom-QMP phy\n"); -- else -- pm_runtime_disable(dev); - - return PTR_ERR_OR_ZERO(phy_provider); - - err_node_put: -- pm_runtime_disable(dev); - of_node_put(child); - return ret; - } --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 8574b989fd3..e251ec15429 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -327,7 +327,6 @@ clk-qcom-sm6115-select-qcom_gdsc.patch scsi-nvme-fc-add-new-routine-nvme_fc_io_getuuid.patch mtd-devices-docg3-check-the-return-value-of-devm_ior.patch phy-qcom-qmp-create-copies-of-qmp-phy-driver.patch -phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch phy-qcom-qmp-usb-disable-runtime-pm-on-unbind.patch phy-qcom-qmp-pcie-split-pcs_misc-region-for-ipq6018-.patch phy-qcom-qmp-pcie-add-pcs_misc-sanity-check.patch diff --git a/queue-5.19/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch b/queue-5.19/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch deleted file mode 100644 index 2a9b05d19fe..00000000000 --- a/queue-5.19/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9863d4b2251a7403c77d8988179cd9557eafd01c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Sep 2022 13:07:13 +0200 -Subject: phy: qcom-qmp-combo: disable runtime PM on unbind - -From: Johan Hovold - -[ Upstream commit 4382d518d1887e62234560ea08a0203d11d28cc1 ] - -Make sure to disable runtime PM also on driver unbind. - -Fixes: ac0d239936bd ("phy: qcom-qmp: Add support for runtime PM"). -Signed-off-by: Johan Hovold -Reviewed-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20220907110728.19092-2-johan+linaro@kernel.org -Signed-off-by: Vinod Koul -Signed-off-by: Sasha Levin ---- - drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -index c7309e981bfb..dcf8a8764e17 100644 ---- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -@@ -6273,7 +6273,9 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) - return -ENOMEM; - - pm_runtime_set_active(dev); -- pm_runtime_enable(dev); -+ ret = devm_pm_runtime_enable(dev); -+ if (ret) -+ return ret; - /* - * Prevent runtime pm from being ON by default. Users can enable - * it using power/control in sysfs. -@@ -6323,13 +6325,10 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) - phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); - if (!IS_ERR(phy_provider)) - dev_info(dev, "Registered Qcom-QMP phy\n"); -- else -- pm_runtime_disable(dev); - - return PTR_ERR_OR_ZERO(phy_provider); - - err_node_put: -- pm_runtime_disable(dev); - of_node_put(child); - return ret; - } --- -2.35.1 - diff --git a/queue-5.19/series b/queue-5.19/series index cab0c79acca..5bfb98e9657 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -456,7 +456,6 @@ scsi-lpfc-fix-various-issues-reported-by-tools.patch mtd-devices-docg3-check-the-return-value-of-devm_ior.patch remoteproc-harden-rproc_handle_vdev-against-integer-.patch phy-qcom-qmp-create-copies-of-qmp-phy-driver.patch -phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch phy-qcom-qmp-usb-disable-runtime-pm-on-unbind.patch phy-qcom-qmp-pcie-split-pcs_misc-region-for-ipq6018-.patch phy-qcom-qmp-pcie-add-pcs_misc-sanity-check.patch diff --git a/queue-6.0/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch b/queue-6.0/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch deleted file mode 100644 index 3ca56977ba5..00000000000 --- a/queue-6.0/phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 37c5dd64e85cd31a946e205b267272fa07c55e47 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Sep 2022 13:07:13 +0200 -Subject: phy: qcom-qmp-combo: disable runtime PM on unbind - -From: Johan Hovold - -[ Upstream commit 4382d518d1887e62234560ea08a0203d11d28cc1 ] - -Make sure to disable runtime PM also on driver unbind. - -Fixes: ac0d239936bd ("phy: qcom-qmp: Add support for runtime PM"). -Signed-off-by: Johan Hovold -Reviewed-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20220907110728.19092-2-johan+linaro@kernel.org -Signed-off-by: Vinod Koul -Signed-off-by: Sasha Levin ---- - drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -index 4b1828976104..bbdca263058c 100644 ---- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -@@ -2537,7 +2537,9 @@ static int qcom_qmp_phy_combo_probe(struct platform_device *pdev) - return -ENOMEM; - - pm_runtime_set_active(dev); -- pm_runtime_enable(dev); -+ ret = devm_pm_runtime_enable(dev); -+ if (ret) -+ return ret; - /* - * Prevent runtime pm from being ON by default. Users can enable - * it using power/control in sysfs. -@@ -2594,13 +2596,10 @@ static int qcom_qmp_phy_combo_probe(struct platform_device *pdev) - phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); - if (!IS_ERR(phy_provider)) - dev_info(dev, "Registered Qcom-QMP phy\n"); -- else -- pm_runtime_disable(dev); - - return PTR_ERR_OR_ZERO(phy_provider); - - err_node_put: -- pm_runtime_disable(dev); - of_node_put(child); - return ret; - } --- -2.35.1 - diff --git a/queue-6.0/series b/queue-6.0/series index 495622b35f6..a12de30f0b0 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -542,7 +542,6 @@ clk-qcom-sm6115-select-qcom_gdsc.patch scsi-lpfc-fix-various-issues-reported-by-tools.patch mtd-devices-docg3-check-the-return-value-of-devm_ior.patch remoteproc-harden-rproc_handle_vdev-against-integer-.patch -phy-qcom-qmp-combo-disable-runtime-pm-on-unbind.patch phy-qcom-qmp-usb-disable-runtime-pm-on-unbind.patch phy-qcom-qmp-pcie-add-pcs_misc-sanity-check.patch phy-qcom-qmp-pcie-fix-memleak-on-probe-deferral.patch