Commit b9332f29 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-hinic3-fix-code-styles' 

Fan Gong says:

====================
net: hinic3: Fix code styles

This patchset provides 4 code styles fixes:

Remove empty lines between error handling.
Remove defensive txq_num check.
Use array_size instead of multiplying.
SQ use SQ_CTXT_PREF_CI_HI to improve readability.
====================

Link: https://patch.msgid.link/cover.1769656467.git.zhuyikai1@h-partners.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b1cd687e 2da903d0

drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c

+0 −1
Original line number Diff line number Diff line
@@ -686,7 +686,6 @@ int hinic3_aeqs_init(struct hinic3_hwdev *hwdev, u16 num_aeqs, 
	}



	destroy_workqueue(aeqs->workq);



err_free_aeqs:

	kfree(aeqs);

drivers/net/ethernet/huawei/hinic3/hinic3_lld.c

+0 −5
Original line number Diff line number Diff line
@@ -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");

drivers/net/ethernet/huawei/hinic3/hinic3_main.c

+0 −4
Original line number Diff line number Diff line
@@ -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");

drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c

+0 −2
Original line number Diff line number Diff line
@@ -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);