drop net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch from everywhere

diff --git a/queue-5.10/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch b/queue-5.10/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch
deleted file mode 100644 (file)
index a198c4e..0000000
--- a/queue-5.10/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8b25b224878f37718790360ac6b9bd106bcd0f4e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 24 Dec 2021 02:14:59 +0000
-Subject: net: phy: fixed_phy: Fix NULL vs IS_ERR() checking in
- __fixed_phy_register
-
-From: Miaoqian Lin <linmq006@gmail.com>
-
-[ Upstream commit b45396afa4177f2b1ddfeff7185da733fade1dc3 ]
-
-The fixed_phy_get_gpiod function() returns NULL, it doesn't return error
-pointers, using NULL checking to fix this.i
-
-Fixes: 5468e82f7034 ("net: phy: fixed-phy: Drop GPIO from fixed_phy_add()")
-Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
-Link: https://lore.kernel.org/r/20211224021500.10362-1-linmq006@gmail.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/phy/fixed_phy.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
-index 18d81f43f2a88..dd30a6883a027 100644
---- a/drivers/net/phy/fixed_phy.c
-+++ b/drivers/net/phy/fixed_phy.c
-@@ -239,8 +239,8 @@ static struct phy_device *__fixed_phy_register(unsigned int irq,
-       /* Check if we have a GPIO associated with this fixed phy */
-       if (!gpiod) {
-               gpiod = fixed_phy_get_gpiod(np);
--              if (IS_ERR(gpiod))
--                      return ERR_CAST(gpiod);
-+              if (!gpiod)
-+                      return ERR_PTR(-EINVAL);
-       }
- 
-       /* Get the next available PHY address, up to PHY_MAX_ADDR */
--- 
-2.34.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 9f09dc2a6f6b45d971c483079b1da8bb8f9a8344..830b68edd271055763056bf0096a86351c890a21 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -13,7 +13,6 @@ net-mlx5e-wrap-the-tx-reporter-dump-callback-to-extr.patch
 net-mlx5e-fix-icosq-recovery-flow-for-xsk.patch
 udp-using-datalen-to-cap-ipv6-udp-max-gso-segments.patch
 selftests-calculate-udpgso-segment-count-without-hea.patch
-net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch
 sctp-use-call_rcu-to-free-endpoint.patch
 net-smc-fix-using-of-uninitialized-completions.patch
 net-usb-pegasus-do-not-drop-long-ethernet-frames.patch

diff --git a/queue-5.15/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch b/queue-5.15/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch
deleted file mode 100644 (file)
index 0dab7ec..0000000
--- a/queue-5.15/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 818c9aa9da0404a2c39402486f8369462b84d392 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 24 Dec 2021 02:14:59 +0000
-Subject: net: phy: fixed_phy: Fix NULL vs IS_ERR() checking in
- __fixed_phy_register
-
-From: Miaoqian Lin <linmq006@gmail.com>
-
-[ Upstream commit b45396afa4177f2b1ddfeff7185da733fade1dc3 ]
-
-The fixed_phy_get_gpiod function() returns NULL, it doesn't return error
-pointers, using NULL checking to fix this.i
-
-Fixes: 5468e82f7034 ("net: phy: fixed-phy: Drop GPIO from fixed_phy_add()")
-Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
-Link: https://lore.kernel.org/r/20211224021500.10362-1-linmq006@gmail.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/phy/fixed_phy.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
-index c65fb5f5d2dc5..a0c256bd54417 100644
---- a/drivers/net/phy/fixed_phy.c
-+++ b/drivers/net/phy/fixed_phy.c
-@@ -239,8 +239,8 @@ static struct phy_device *__fixed_phy_register(unsigned int irq,
-       /* Check if we have a GPIO associated with this fixed phy */
-       if (!gpiod) {
-               gpiod = fixed_phy_get_gpiod(np);
--              if (IS_ERR(gpiod))
--                      return ERR_CAST(gpiod);
-+              if (!gpiod)
-+                      return ERR_PTR(-EINVAL);
-       }
- 
-       /* Get the next available PHY address, up to PHY_MAX_ADDR */
--- 
-2.34.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index af3242913cf31e22024efca5fc21c382b26df11c..e98cf1235c2c35f24a166c5eb06d9fd756006c39 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -25,7 +25,6 @@ net-mlx5e-use-tc-sample-stubs-instead-of-ifdefs-in-s.patch
 net-mlx5e-delete-forward-rule-for-ct-or-sample-actio.patch
 udp-using-datalen-to-cap-ipv6-udp-max-gso-segments.patch
 selftests-calculate-udpgso-segment-count-without-hea.patch
-net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch
 sctp-use-call_rcu-to-free-endpoint.patch
 net-smc-fix-using-of-uninitialized-completions.patch
 net-usb-pegasus-do-not-drop-long-ethernet-frames.patch

diff --git a/queue-5.4/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch b/queue-5.4/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch
deleted file mode 100644 (file)
index 905ca13..0000000
--- a/queue-5.4/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 90d833556a0890bff159402c45c06a2fd171754c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 24 Dec 2021 02:14:59 +0000
-Subject: net: phy: fixed_phy: Fix NULL vs IS_ERR() checking in
- __fixed_phy_register
-
-From: Miaoqian Lin <linmq006@gmail.com>
-
-[ Upstream commit b45396afa4177f2b1ddfeff7185da733fade1dc3 ]
-
-The fixed_phy_get_gpiod function() returns NULL, it doesn't return error
-pointers, using NULL checking to fix this.i
-
-Fixes: 5468e82f7034 ("net: phy: fixed-phy: Drop GPIO from fixed_phy_add()")
-Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
-Link: https://lore.kernel.org/r/20211224021500.10362-1-linmq006@gmail.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/phy/fixed_phy.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
-index 4190f9ed5313d..9afb09c3eba1a 100644
---- a/drivers/net/phy/fixed_phy.c
-+++ b/drivers/net/phy/fixed_phy.c
-@@ -245,8 +245,8 @@ static struct phy_device *__fixed_phy_register(unsigned int irq,
-       /* Check if we have a GPIO associated with this fixed phy */
-       if (!gpiod) {
-               gpiod = fixed_phy_get_gpiod(np);
--              if (IS_ERR(gpiod))
--                      return ERR_CAST(gpiod);
-+              if (!gpiod)
-+                      return ERR_PTR(-EINVAL);
-       }
- 
-       /* Get the next available PHY address, up to PHY_MAX_ADDR */
--- 
-2.34.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index abb5cefb473e7de6c55a1877c5df1b369d6b0327..3bfee443def95f99542ca5079f8639c851e251cb 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -11,7 +11,6 @@ scsi-lpfc-terminate-string-in-lpfc_debugfs_nvmeio_tr.patch
 net-mlx5-dr-fix-null-vs-is_err-checking-in-dr_domain.patch
 udp-using-datalen-to-cap-ipv6-udp-max-gso-segments.patch
 selftests-calculate-udpgso-segment-count-without-hea.patch
-net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch
 sctp-use-call_rcu-to-free-endpoint.patch
 net-usb-pegasus-do-not-drop-long-ethernet-frames.patch
 net-lantiq_xrx200-fix-statistics-of-received-bytes.patch