| Message ID | 20201211083801.1632-1-zhengyongjun3@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [net-next] net/mediatek: simplify the mediatek code return expression | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Fri, 11 Dec 2020 16:38:01 +0800 you wrote: > Simplify the return expression at mtk_eth_path.c file, simplify this all. > > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> > --- > drivers/net/ethernet/mediatek/mtk_eth_path.c | 16 ++++------------ > 1 file changed, 4 insertions(+), 12 deletions(-) Here is the summary with links: - [net-next] net/mediatek: simplify the mediatek code return expression https://git.kernel.org/netdev/net-next/c/bb7eae6dd230 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_path.c b/drivers/net/ethernet/mediatek/mtk_eth_path.c index 6bc9f2487384..72648535a14d 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_path.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_path.c @@ -252,7 +252,7 @@ int mtk_gmac_sgmii_path_setup(struct mtk_eth *eth, int mac_id) int mtk_gmac_gephy_path_setup(struct mtk_eth *eth, int mac_id) { - int err, path = 0; + int path = 0; if (mac_id == 1) path = MTK_ETH_PATH_GMAC2_GEPHY; @@ -261,25 +261,17 @@ int mtk_gmac_gephy_path_setup(struct mtk_eth *eth, int mac_id) return -EINVAL; /* Setup proper MUXes along the path */ - err = mtk_eth_mux_setup(eth, path); - if (err) - return err; - - return 0; + return mtk_eth_mux_setup(eth, path); } int mtk_gmac_rgmii_path_setup(struct mtk_eth *eth, int mac_id) { - int err, path; + int path; path = (mac_id == 0) ? MTK_ETH_PATH_GMAC1_RGMII : MTK_ETH_PATH_GMAC2_RGMII; /* Setup proper MUXes along the path */ - err = mtk_eth_mux_setup(eth, path); - if (err) - return err; - - return 0; + return mtk_eth_mux_setup(eth, path); }
Simplify the return expression at mtk_eth_path.c file, simplify this all. Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> --- drivers/net/ethernet/mediatek/mtk_eth_path.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)