2020-09-21 13:11:23

by Qinglang Miao

Subject: [PATCH -next] chelsio: simplify the return expression of t3_ael2020_phy_prep()

Simplify the return expression.

Signed-off-by: Qinglang Miao <[email protected]>
---
drivers/net/ethernet/chelsio/cxgb3/ael1002.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/chelsio/cxgb3/ael1002.c b/drivers/net/ethernet/chelsio/cxgb3/ael1002.c
index dadf11e3d..9d591f0dd 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/ael1002.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/ael1002.c
@@ -815,17 +815,12 @@ static const struct cphy_ops ael2020_ops = {
int t3_ael2020_phy_prep(struct cphy *phy, struct adapter *adapter, int phy_addr,
const struct mdio_ops *mdio_ops)
{
- int err;
-
cphy_init(phy, adapter, phy_addr, &ael2020_ops, mdio_ops,
SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_FIBRE |
SUPPORTED_IRQ, "10GBASE-R");
msleep(125);

- err = set_phy_regs(phy, ael2020_reset_regs);
- if (err)
- return err;
- return 0;
+ return set_phy_regs(phy, ael2020_reset_regs);
}

/*
--
2.23.0

2020-09-21 20:52:33

by David Miller

Subject: Re: [PATCH -next] chelsio: simplify the return expression of t3_ael2020_phy_prep()

From: Qinglang Miao <[email protected]>
Date: Mon, 21 Sep 2020 21:10:05 +0800

> Simplify the return expression.
>
> Signed-off-by: Qinglang Miao <[email protected]>

Applied.