| Message ID | 20201209092107.20306-1-zhengyongjun3@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [net-next] net: freescale: dpaa: simplify the return dpaa_eth_refill_bpools() | expand |
> -----Original Message----- > From: Zheng Yongjun <zhengyongjun3@huawei.com> > Sent: 09 December 2020 11:21 > To: davem@davemloft.net; netdev@vger.kernel.org > Cc: kuba@kernel.org; linux-kernel@vger.kernel.org; Madalin Bucur > <madalin.bucur@nxp.com>; Zheng Yongjun <zhengyongjun3@huawei.com> > Subject: [PATCH net-next] net: freescale: dpaa: simplify the return > dpaa_eth_refill_bpools() > > Simplify the return expression. > > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> > --- > drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c > b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c > index cb7c028b1bf5..edc8222d96dc 100644 > --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c > +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c > @@ -1599,17 +1599,13 @@ static int dpaa_eth_refill_bpools(struct dpaa_priv > *priv) > { > struct dpaa_bp *dpaa_bp; > int *countptr; > - int res; > > dpaa_bp = priv->dpaa_bp; > if (!dpaa_bp) > return -EINVAL; > countptr = this_cpu_ptr(dpaa_bp->percpu_count); > - res = dpaa_eth_refill_bpool(dpaa_bp, countptr); > - if (res) > - return res; > > - return 0; > + return dpaa_eth_refill_bpool(dpaa_bp, countptr); > } > > /* Cleanup function for outgoing frame descriptors that were built on Tx > path, > -- > 2.22.0 Acked-by: Madalin Bucur <madalin.bucur@oss.nxp.com>
From: Zheng Yongjun <zhengyongjun3@huawei.com> Date: Wed, 9 Dec 2020 17:21:07 +0800 > Simplify the return expression. > > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> Applied.
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index cb7c028b1bf5..edc8222d96dc 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -1599,17 +1599,13 @@ static int dpaa_eth_refill_bpools(struct dpaa_priv *priv) { struct dpaa_bp *dpaa_bp; int *countptr; - int res; dpaa_bp = priv->dpaa_bp; if (!dpaa_bp) return -EINVAL; countptr = this_cpu_ptr(dpaa_bp->percpu_count); - res = dpaa_eth_refill_bpool(dpaa_bp, countptr); - if (res) - return res; - return 0; + return dpaa_eth_refill_bpool(dpaa_bp, countptr); } /* Cleanup function for outgoing frame descriptors that were built on Tx path,
Simplify the return expression. Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> --- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)