hinic3: Fix code Style(remove empty lines between error handling)

According to previous review comment, fix code style of removing empty
lines between the actions on the error handling path to make it more
idiomatic in the merged code.

Link: https://lore.kernel.org/netdev/20250902180937.4c8d9eb3@kernel.org/
Co-developed-by: Zhu Yikai <zhuyikai1@h-partners.com>
Signed-off-by: Zhu Yikai <zhuyikai1@h-partners.com>
Signed-off-by: Fan Gong <gongfan1@huawei.com>
Link: https://patch.msgid.link/ccff2ae7abe91bb3618ded9bb5ef2dc9cb243d22.1769656467.git.zhuyikai1@h-partners.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c b/drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c
index ef539d1b69a3bdd9324091e977f195aff9078bfa..86720bb119e962386459fcb69b806e6770e9c28e 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c
@@ -878,14 +878,11 @@ err_free_cmd_infos:
        }
 
        hinic3_free_db_addr(hwdev, cmdqs->cmdqs_db_base);
-
 err_destroy_cmdq_wq:
        destroy_cmdq_wq(hwdev, cmdqs);
-
 err_free_cmdqs:
        dma_pool_destroy(cmdqs->cmd_buf_pool);
        kfree(cmdqs);
-
 err_out:
        return err;
 }

diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c b/drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c
index 1ecc2aca1e3537d3ff7ae25d2566973507412cc1..a2c3962116d5960c2de0136705bf8bf3d0e49594 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c
@@ -686,7 +686,6 @@ err_remove_eqs:
        }
 
        destroy_workqueue(aeqs->workq);
-
 err_free_aeqs:
        kfree(aeqs);
 

diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c b/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c
index 2b77fea1e0b33a332ddfc34e77edfafc0de7c291..87413e192f1097a8ec0bcff18a42863632b9a8a6 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c
@@ -230,7 +230,6 @@ err_unmap_mgmt_reg_base:
                iounmap(pci_adapter->mgmt_reg_base);
 err_unmap_intr_reg_base:
        iounmap(pci_adapter->intr_reg_base);
-
 err_unmap_cfg_reg_base:
        iounmap(pci_adapter->cfg_reg_base);
 
@@ -285,10 +284,8 @@ static int hinic3_pci_init(struct pci_dev *pdev)
 err_release_regions:
        pci_clear_master(pdev);
        pci_release_regions(pdev);
-
 err_disable_device:
        pci_disable_device(pdev);
-
 err_free_pci_adapter:
        pci_set_drvdata(pdev, NULL);
        mutex_destroy(&pci_adapter->pdev_mutex);
@@ -382,7 +379,6 @@ err_uninit_func:
        hinic3_func_uninit(pdev);
 err_unmap_bar:
        hinic3_unmapping_bar(pci_adapter);
-
 err_out:
        dev_err(&pdev->dev, "PCIe device probe function failed\n");
 
@@ -415,7 +411,6 @@ static int hinic3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 err_uninit_pci:
        hinic3_pci_uninit(pdev);
-
 err_out:
        dev_err(&pdev->dev, "PCIe device probe failed\n");
 

diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_main.c b/drivers/net/ethernet/huawei/hinic3/hinic3_main.c
index a33f86675954b78a020466dd51d2d1f16a604fa4..6275d94dfefd5ef7d24cb6818cc3fd14311cb553 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_main.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_main.c
@@ -104,7 +104,6 @@ static int hinic3_alloc_txrxqs(struct net_device *netdev)
 
 err_free_rxqs:
        hinic3_free_rxqs(netdev);
-
 err_free_txqs:
        hinic3_free_txqs(netdev);
 
@@ -475,17 +474,14 @@ err_uninit_nic_feature:
        disable_delayed_work_sync(&nic_dev->periodic_work);
        hinic3_update_nic_feature(nic_dev, 0);
        hinic3_set_nic_feature_to_hw(nic_dev);
-
 err_uninit_sw:
        hinic3_sw_uninit(netdev);
-
 err_free_nic_io:
        hinic3_free_nic_io(nic_dev);
 err_free_nic_dev:
        hinic3_free_nic_dev(nic_dev);
 err_free_netdev:
        free_netdev(netdev);
-
 err_unregister_adev_event:
        hinic3_adev_event_unregister(adev);
        dev_err(&pdev->dev, "NIC service probe failed\n");

diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c b/drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c
index 6eb441d6a59010c27982384417f02e8406ddbb14..c871fd0fb10911c22f683cacc81f0128032535b0 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c
@@ -446,10 +446,8 @@ err_uninit_func_mbox_msg_ch:
                hinic3_uninit_func_mbox_msg_channel(hwdev);
 err_uninit_mgmt_msg_ch:
        uninit_mgmt_msg_channel(mbox);
-
 err_destroy_workqueue:
        destroy_workqueue(mbox->workq);
-
 err_free_mbox:
        kfree(mbox);
 

diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c b/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c
index ef32aed7d761dbaa45c153ab7626718b630828e3..4e361c9bd043dbbb36837ab2d966f4bf2b63f905 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c
@@ -609,7 +609,6 @@ static netdev_tx_t hinic3_send_one_skb(struct sk_buff *skb,
 
 err_drop_pkt:
        dev_kfree_skb_any(skb);
-
 err_out:
        return NETDEV_TX_OK;
 }