Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5450804 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Greg Kroah-Hartman
Browse files

net: ethernet: stmmac: Do not use unreachable() in ipq806x_gmac_probe() 



[ Upstream commit 4367355dd90942a71641c98c40c74589c9bddf90 ]

When compiling with clang in certain configurations, an objtool warning
appears:

drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.o: warning: objtool:
ipq806x_gmac_probe() falls through to next function phy_modes()

This happens because the unreachable annotation in the third switch
statement is not eliminated. The compiler should know that the first
default case would prevent the second and third from being reached as
the comment notes but sanitizer options can make it harder for the
compiler to reason this out.

Help the compiler out by eliminating the unreachable() annotation and
unifying the default case error handling so that there is no objtool
warning, the meaning of the code stays the same, and there is less
duplication.

Reported-by: default avatarSami Tolvanen <samitolvanen@google.com>
Tested-by: default avatarSami Tolvanen <samitolvanen@google.com>
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ed3400f2

drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c

+8 −10
Original line number Diff line number Diff line
@@ -288,10 +288,7 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) 
		val &= ~NSS_COMMON_GMAC_CTL_PHY_IFACE_SEL;

		break;

	default:

		dev_err(&pdev->dev, "Unsupported PHY mode: \"%s\"\n",

			phy_modes(gmac->phy_mode));

		err = -EINVAL;

		goto err_remove_config_dt;

		goto err_unsupported_phy;

	}

	regmap_write(gmac->nss_common, NSS_COMMON_GMAC_CTL(gmac->id), val);
@@ -308,10 +305,7 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) 
			NSS_COMMON_CLK_SRC_CTRL_OFFSET(gmac->id);

		break;

	default:

		dev_err(&pdev->dev, "Unsupported PHY mode: \"%s\"\n",

			phy_modes(gmac->phy_mode));

		err = -EINVAL;

		goto err_remove_config_dt;

		goto err_unsupported_phy;

	}

	regmap_write(gmac->nss_common, NSS_COMMON_CLK_SRC_CTRL, val);
@@ -328,8 +322,7 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) 
				NSS_COMMON_CLK_GATE_GMII_TX_EN(gmac->id);

		break;

	default:

		/* We don't get here; the switch above will have errored out */

		unreachable();

		goto err_unsupported_phy;

	}

	regmap_write(gmac->nss_common, NSS_COMMON_CLK_GATE, val);
@@ -360,6 +353,11 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) 


	return 0;



err_unsupported_phy:

	dev_err(&pdev->dev, "Unsupported PHY mode: \"%s\"\n",

		phy_modes(gmac->phy_mode));

	err = -EINVAL;



err_remove_config_dt:

	stmmac_remove_config_dt(pdev, plat_dat);