* [PATCH -next] net: qlcnic: simplify the return expression of qlcnic_83xx_shutdown
@ 2020-09-21 13:10 Qinglang Miao
2020-09-21 20:43 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Qinglang Miao @ 2020-09-21 13:10 UTC (permalink / raw)
To: Shahed Shaikh, Manish Chopra, GR-Linux-NIC-Dev
Cc: David S. Miller, Jakub Kicinski, netdev, linux-kernel, Qinglang Miao
Simplify the return expression.
Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] net: qlcnic: simplify the return expression of qlcnic_83xx_shutdown
2020-09-21 13:10 [PATCH -next] net: qlcnic: simplify the return expression of qlcnic_83xx_shutdown Qinglang Miao
@ 2020-09-21 20:43 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-09-21 20:43 UTC (permalink / raw)
To: miaoqinglang
Cc: shshaikh, manishc, GR-Linux-NIC-Dev, kuba, netdev, linux-kernel
From: Qinglang Miao <miaoqinglang@huawei.com>
Date: Mon, 21 Sep 2020 21:10:46 +0800
> Simplify the return expression.
>
> Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-21 20:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-21 13:10 [PATCH -next] net: qlcnic: simplify the return expression of qlcnic_83xx_shutdown Qinglang Miao
2020-09-21 20:43 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).