2020-09-21 13:12:41

by Qinglang Miao

Subject: [PATCH -next] net: qlcnic: simplify the return expression of qlcnic_83xx_shutdown

Simplify the return expression.

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

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 81a688dd0..d8882d0b6 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -3811,7 +3811,6 @@ static int qlcnic_83xx_shutdown(struct pci_dev *pdev)
{
struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
struct net_device *netdev = adapter->netdev;
- int retval;

netif_device_detach(netdev);
qlcnic_cancel_idc_work(adapter);
@@ -3822,11 +3821,7 @@ static int qlcnic_83xx_shutdown(struct pci_dev *pdev)
qlcnic_83xx_disable_mbx_intr(adapter);
cancel_delayed_work_sync(&adapter->idc_aen_work);

- retval = pci_save_state(pdev);
- if (retval)
- return retval;
-
- return 0;
+ return pci_save_state(pdev);
}

static int qlcnic_83xx_resume(struct qlcnic_adapter *adapter)
--
2.23.0

2020-09-21 20:45:19

by David Miller

Subject: Re: [PATCH -next] net: qlcnic: simplify the return expression of qlcnic_83xx_shutdown

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

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

Applied.