fix up 5.15 build

diff --git a/queue-5.15/net-dsa-microchip-fix-initial-port-flush-problem.patch b/queue-5.15/net-dsa-microchip-fix-initial-port-flush-problem.patch
index b95442f2268aceffd616ff9b75d9f0dd0009eefb..6ee53f57abbf1f4a7a75ae5c1eb29024e6c7510e 100644 (file)
--- a/queue-5.15/net-dsa-microchip-fix-initial-port-flush-problem.patch
+++ b/queue-5.15/net-dsa-microchip-fix-initial-port-flush-problem.patch
@@ -23,15 +23,22 @@ Signed-off-by: Tristram Ha <tristram.ha@microchip.com>
 Link: https://patch.msgid.link/1718756202-2731-1-git-send-email-Tristram.Ha@microchip.com
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/net/dsa/microchip/ksz9477.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ drivers/net/dsa/microchip/ksz9477.c |    7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
-index bf788e17f408f..293c327db2eef 100644
 --- a/drivers/net/dsa/microchip/ksz9477.c
 +++ b/drivers/net/dsa/microchip/ksz9477.c
-@@ -206,10 +206,8 @@ static int ksz9477_reset_switch(struct ksz_device *dev)
+@@ -195,7 +195,6 @@ static int ksz9477_wait_alu_sta_ready(st
+ 
+ static int ksz9477_reset_switch(struct ksz_device *dev)
+ {
+-      u8 data8;
+       u32 data32;
+ 
+       /* reset switch */
+@@ -206,10 +205,8 @@ static int ksz9477_reset_switch(struct k
                           SPI_AUTO_EDGE_DETECTION, 0);
  
        /* default configuration */
@@ -44,6 +51,3 @@ index bf788e17f408f..293c327db2eef 100644
  
        /* disable interrupts */
        ksz_write32(dev, REG_SW_INT_MASK__4, SWITCH_INT_MASK);
--- 
-2.43.0
-