mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 05:31:37 -04:00
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>
This commit is contained in:
@@ -878,14 +878,11 @@ int hinic3_cmdqs_init(struct hinic3_hwdev *hwdev)
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -686,7 +686,6 @@ int hinic3_aeqs_init(struct hinic3_hwdev *hwdev, u16 num_aeqs,
|
||||
}
|
||||
|
||||
destroy_workqueue(aeqs->workq);
|
||||
|
||||
err_free_aeqs:
|
||||
kfree(aeqs);
|
||||
|
||||
|
||||
@@ -230,7 +230,6 @@ static int hinic3_mapping_bar(struct pci_dev *pdev,
|
||||
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 @@ static int hinic3_probe_func(struct hinic3_pcidev *pci_adapter)
|
||||
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");
|
||||
|
||||
|
||||
@@ -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 @@ static int hinic3_nic_probe(struct auxiliary_device *adev,
|
||||
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");
|
||||
|
||||
@@ -446,10 +446,8 @@ int hinic3_init_mbox(struct hinic3_hwdev *hwdev)
|
||||
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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user