drop pinctrl-freescale-imx-use-devm_of_iomap-to-avoid-a-r.patch

diff --git a/queue-5.4/pinctrl-freescale-imx-use-devm_of_iomap-to-avoid-a-r.patch b/queue-5.4/pinctrl-freescale-imx-use-devm_of_iomap-to-avoid-a-r.patch
deleted file mode 100644 (file)
index a03b5ea..0000000
--- a/queue-5.4/pinctrl-freescale-imx-use-devm_of_iomap-to-avoid-a-r.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From dc4af01da9e16223769a534984b494aaa6b7952a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jun 2020 22:06:26 +0200
-Subject: pinctrl: freescale: imx: Use 'devm_of_iomap()' to avoid a resource
- leak in case of error in 'imx_pinctrl_probe()'
-
-From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-
-[ Upstream commit ba403242615c2c99e27af7984b1650771a2cc2c9 ]
-
-Use 'devm_of_iomap()' instead 'of_iomap()' to avoid a resource leak in
-case of error.
-
-Update the error handling code accordingly.
-
-Fixes: 26d8cde5260b ("pinctrl: freescale: imx: add shared input select reg support")
-Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
-Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
-Link: https://lore.kernel.org/r/20200602200626.677981-1-christophe.jaillet@wanadoo.fr
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pinctrl/freescale/pinctrl-imx.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
-index 1f81569c7ae3b..cb7e0f08d2cf4 100644
---- a/drivers/pinctrl/freescale/pinctrl-imx.c
-+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
-@@ -824,12 +824,13 @@ int imx_pinctrl_probe(struct platform_device *pdev,
-                               return -EINVAL;
-                       }
- 
--                      ipctl->input_sel_base = of_iomap(np, 0);
-+                      ipctl->input_sel_base = devm_of_iomap(&pdev->dev, np,
-+                                                            0, NULL);
-                       of_node_put(np);
--                      if (!ipctl->input_sel_base) {
-+                      if (IS_ERR(ipctl->input_sel_base)) {
-                               dev_err(&pdev->dev,
-                                       "iomuxc input select base address not found\n");
--                              return -ENOMEM;
-+                              return PTR_ERR(ipctl->input_sel_base);
-                       }
-               }
-       }
--- 
-2.25.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 786fd7d267eb39642037ff0f8f8eea301a789d28..2741ca04310d52c5f89389349cfa170dfe6d3299 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -214,7 +214,6 @@ scsi-iscsi-fix-reference-count-leak-in-iscsi_boot_cr.patch
 scsi-ufs-don-t-update-urgent-bkops-level-when-toggli.patch
 pinctrl-imxl-fix-an-error-handling-path-in-imx1_pinc.patch
 pinctrl-freescale-imx-fix-an-error-handling-path-in-.patch
-pinctrl-freescale-imx-use-devm_of_iomap-to-avoid-a-r.patch
 nfsd-safer-handling-of-corrupted-c_type.patch
 drm-amd-display-revalidate-bandwidth-before-commitin.patch
 crypto-omap-sham-add-proper-load-balancing-support-f.patch

diff --git a/queue-5.7/pinctrl-freescale-imx-use-devm_of_iomap-to-avoid-a-r.patch b/queue-5.7/pinctrl-freescale-imx-use-devm_of_iomap-to-avoid-a-r.patch
deleted file mode 100644 (file)
index 5f16a4d..0000000
--- a/queue-5.7/pinctrl-freescale-imx-use-devm_of_iomap-to-avoid-a-r.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 74ef8ade91ddc78eb6d5d7c866b3b58c4f93a9c6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jun 2020 22:06:26 +0200
-Subject: pinctrl: freescale: imx: Use 'devm_of_iomap()' to avoid a resource
- leak in case of error in 'imx_pinctrl_probe()'
-
-From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-
-[ Upstream commit ba403242615c2c99e27af7984b1650771a2cc2c9 ]
-
-Use 'devm_of_iomap()' instead 'of_iomap()' to avoid a resource leak in
-case of error.
-
-Update the error handling code accordingly.
-
-Fixes: 26d8cde5260b ("pinctrl: freescale: imx: add shared input select reg support")
-Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
-Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
-Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
-Link: https://lore.kernel.org/r/20200602200626.677981-1-christophe.jaillet@wanadoo.fr
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pinctrl/freescale/pinctrl-imx.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
-index 1f81569c7ae3b..cb7e0f08d2cf4 100644
---- a/drivers/pinctrl/freescale/pinctrl-imx.c
-+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
-@@ -824,12 +824,13 @@ int imx_pinctrl_probe(struct platform_device *pdev,
-                               return -EINVAL;
-                       }
- 
--                      ipctl->input_sel_base = of_iomap(np, 0);
-+                      ipctl->input_sel_base = devm_of_iomap(&pdev->dev, np,
-+                                                            0, NULL);
-                       of_node_put(np);
--                      if (!ipctl->input_sel_base) {
-+                      if (IS_ERR(ipctl->input_sel_base)) {
-                               dev_err(&pdev->dev,
-                                       "iomuxc input select base address not found\n");
--                              return -ENOMEM;
-+                              return PTR_ERR(ipctl->input_sel_base);
-                       }
-               }
-       }
--- 
-2.25.1
-

diff --git a/queue-5.7/series b/queue-5.7/series
index 5d3c0b10db58a4f3a70378b6ed406bc2d6271338..243755d53ff380216d08a6b08360b5a6bfd36782 100644 (file)
--- a/queue-5.7/series
+++ b/queue-5.7/series
@@ -315,7 +315,6 @@ modpost-fix-i-ignore-errors-makeflags-detection.patch
 pinctrl-imxl-fix-an-error-handling-path-in-imx1_pinc.patch
 pinctrl-sirf-add-missing-put_device-call-in-sirfsoc_.patch
 pinctrl-freescale-imx-fix-an-error-handling-path-in-.patch
-pinctrl-freescale-imx-use-devm_of_iomap-to-avoid-a-r.patch
 nfsd-safer-handling-of-corrupted-c_type.patch
 rdma-cm-spurious-warning-triggered-in-cm_destroy_id.patch
 drm-amd-display-revalidate-bandwidth-before-commitin.patch