Skip to content

Commit

Permalink
Merge branch 'hns-kdoc'
Browse files Browse the repository at this point in the history
Wang Hai says:

====================
Fix some kernel-doc warnings for hns.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
davem330 committed Sep 10, 2020
2 parents cdd0a37 + 07a5747 commit 3fe6ab1
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/hisilicon/hns/hnae.c
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ EXPORT_SYMBOL(hnae_ae_register);

/**
* hnae_ae_unregister - unregisters a HNAE AE engine
* @cdev: the device to unregister
* @hdev: the device to unregister
*/
void hnae_ae_unregister(struct hnae_ae_dev *hdev)
{
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ static void hns_xgmac_lf_rf_control_init(struct mac_driver *mac_drv)

/**
*hns_xgmac_enable - enable xgmac port
*@drv: mac driver
*@mac_drv: mac driver
*@mode: mode of mac port
*/
static void hns_xgmac_enable(void *mac_drv, enum mac_commom_mode mode)
Expand Down Expand Up @@ -490,7 +490,6 @@ static void hns_xgmac_get_link_status(void *mac_drv, u32 *link_stat)
/**
*hns_xgmac_get_regs - dump xgmac regs
*@mac_drv: mac driver
*@cmd:ethtool cmd
*@data:data for value of regs
*/
static void hns_xgmac_get_regs(void *mac_drv, void *data)
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/ethernet/hisilicon/hns/hns_enet.c
Original file line number Diff line number Diff line change
Expand Up @@ -1829,8 +1829,7 @@ static int hns_nic_uc_unsync(struct net_device *netdev,

/**
* nic_set_multicast_list - set mutl mac address
* @netdev: net device
* @p: mac address
* @ndev: net device
*
* return void
*/
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ static int wait_for_api_cmd_completion(struct hinic_api_cmd_chain *chain)
* @chain: chain for the command
* @dest: destination node on the card that will receive the command
* @cmd: command data
* @size: the command size
* @cmd_size: the command size
*
* Return 0 - Success, negative - Failure
**/
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ enum eq_arm_state {
* @aeqs: pointer to Async eqs of the chip
* @event: aeq event to register callback for it
* @handle: private data will be used by the callback
* @hw_handler: callback function
* @hwe_handler: callback function
**/
void hinic_aeq_register_hw_cb(struct hinic_aeqs *aeqs,
enum hinic_aeq_type event, void *handle,
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/huawei/hinic/hinic_hw_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,8 @@ static void destroy_qp(struct hinic_func_to_io *func_to_io,
* @func_to_io: func to io channel that holds the IO components
* @base_qpn: base qp number
* @num_qps: number queue pairs to create
* @sq_msix_entry: msix entries for sq
* @rq_msix_entry: msix entries for rq
* @sq_msix_entries: msix entries for sq
* @rq_msix_entries: msix entries for rq
*
* Return 0 - Success, negative - Failure
**/
Expand Down

0 comments on commit 3fe6ab1

Please sign in to comment.