790-30-v6.9-net-dsa-mt7530-empty-default-case-on-mt7530_setup_po.patch 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. From 959f4ac4940bebb84bdd25ac61470b3965e1e475 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
  3. Date: Tue, 6 Feb 2024 01:08:02 +0300
  4. Subject: [PATCH 30/48] net: dsa: mt7530: empty default case on
  5. mt7530_setup_port5()
  6. MIME-Version: 1.0
  7. Content-Type: text/plain; charset=UTF-8
  8. Content-Transfer-Encoding: 8bit
  9. There're two code paths for setting up port 5:
  10. mt7530_setup()
  11. -> mt7530_setup_port5()
  12. mt753x_phylink_mac_config()
  13. -> mt753x_mac_config()
  14. -> mt7530_mac_config()
  15. -> mt7530_setup_port5()
  16. On the first code path, priv->p5_intf_sel is either set to
  17. P5_INTF_SEL_PHY_P0 or P5_INTF_SEL_PHY_P4 when mt7530_setup_port5() is run.
  18. On the second code path, priv->p5_intf_sel is set to P5_INTF_SEL_GMAC5 when
  19. mt7530_setup_port5() is run.
  20. Empty the default case which will never run but is needed nonetheless to
  21. handle all the remaining enumeration values.
  22. Reviewed-by: Vladimir Oltean <[email protected]>
  23. Reviewed-by: Russell King (Oracle) <[email protected]>
  24. Signed-off-by: Arınç ÜNAL <[email protected]>
  25. Link: https://lore.kernel.org/r/20240206-for-netnext-mt7530-improvements-2-v5-1-d7d92a185cb1@arinc9.com
  26. Signed-off-by: Jakub Kicinski <[email protected]>
  27. ---
  28. drivers/net/dsa/mt7530.c | 5 +----
  29. 1 file changed, 1 insertion(+), 4 deletions(-)
  30. --- a/drivers/net/dsa/mt7530.c
  31. +++ b/drivers/net/dsa/mt7530.c
  32. @@ -936,9 +936,7 @@ static void mt7530_setup_port5(struct ds
  33. val &= ~MHWTRAP_P5_DIS;
  34. break;
  35. default:
  36. - dev_err(ds->dev, "Unsupported p5_intf_sel %d\n",
  37. - priv->p5_intf_sel);
  38. - goto unlock_exit;
  39. + break;
  40. }
  41. /* Setup RGMII settings */
  42. @@ -968,7 +966,6 @@ static void mt7530_setup_port5(struct ds
  43. dev_dbg(ds->dev, "Setup P5, HWTRAP=0x%x, intf_sel=%s, phy-mode=%s\n",
  44. val, p5_intf_modes(priv->p5_intf_sel), phy_modes(interface));
  45. -unlock_exit:
  46. mutex_unlock(&priv->reg_mutex);
  47. }