mirror of https://gitee.com/openkylin/linux.git
net: hns: Remove redundant mac_get_id()
There is a mac_id in mac control block structure, so the callback function mac_get_id() is useless. Here we remove this function. Reported-by: Weiwei Deng <dengweiwei@huawei.com> Signed-off-by: Kejian Yan <yankejian@huawei.com> Reviewed-by: Salil Mehta <salil.mehta@huawei.com> Signed-off-by: Salil Mehta <salil.mehta@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
040a3800aa
commit
20f0d4f736
|
@ -466,13 +466,6 @@ static int hns_gmac_config_loopback(void *mac_drv, enum hnae_loop loop_mode,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void hns_gmac_get_id(void *mac_drv, u8 *mac_id)
|
|
||||||
{
|
|
||||||
struct mac_driver *drv = (struct mac_driver *)mac_drv;
|
|
||||||
|
|
||||||
*mac_id = drv->mac_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hns_gmac_get_info(void *mac_drv, struct mac_info *mac_info)
|
static void hns_gmac_get_info(void *mac_drv, struct mac_info *mac_info)
|
||||||
{
|
{
|
||||||
enum hns_gmac_duplex_mdoe duplex;
|
enum hns_gmac_duplex_mdoe duplex;
|
||||||
|
@ -714,7 +707,6 @@ void *hns_gmac_config(struct hns_mac_cb *mac_cb, struct mac_params *mac_param)
|
||||||
mac_drv->config_pad_and_crc = hns_gmac_config_pad_and_crc;
|
mac_drv->config_pad_and_crc = hns_gmac_config_pad_and_crc;
|
||||||
mac_drv->config_half_duplex = hns_gmac_set_duplex_type;
|
mac_drv->config_half_duplex = hns_gmac_set_duplex_type;
|
||||||
mac_drv->set_rx_ignore_pause_frames = hns_gmac_set_rx_auto_pause_frames;
|
mac_drv->set_rx_ignore_pause_frames = hns_gmac_set_rx_auto_pause_frames;
|
||||||
mac_drv->mac_get_id = hns_gmac_get_id;
|
|
||||||
mac_drv->get_info = hns_gmac_get_info;
|
mac_drv->get_info = hns_gmac_get_info;
|
||||||
mac_drv->autoneg_stat = hns_gmac_autoneg_stat;
|
mac_drv->autoneg_stat = hns_gmac_autoneg_stat;
|
||||||
mac_drv->get_pause_enable = hns_gmac_get_pausefrm_cfg;
|
mac_drv->get_pause_enable = hns_gmac_get_pausefrm_cfg;
|
||||||
|
|
|
@ -373,8 +373,6 @@ struct mac_driver {
|
||||||
void (*set_rx_ignore_pause_frames)(void *mac_drv, u32 enable);
|
void (*set_rx_ignore_pause_frames)(void *mac_drv, u32 enable);
|
||||||
/* config rx mode for promiscuous*/
|
/* config rx mode for promiscuous*/
|
||||||
void (*set_promiscuous)(void *mac_drv, u8 enable);
|
void (*set_promiscuous)(void *mac_drv, u8 enable);
|
||||||
/* get mac id */
|
|
||||||
void (*mac_get_id)(void *mac_drv, u8 *mac_id);
|
|
||||||
void (*mac_pausefrm_cfg)(void *mac_drv, u32 rx_en, u32 tx_en);
|
void (*mac_pausefrm_cfg)(void *mac_drv, u32 rx_en, u32 tx_en);
|
||||||
|
|
||||||
void (*autoneg_stat)(void *mac_drv, u32 *enable);
|
void (*autoneg_stat)(void *mac_drv, u32 *enable);
|
||||||
|
|
|
@ -299,18 +299,6 @@ static void hns_xgmac_set_tx_auto_pause_frames(void *mac_drv, u16 enable)
|
||||||
dsaf_write_dev(drv, XGMAC_MAC_PAUSE_TIME_REG, enable);
|
dsaf_write_dev(drv, XGMAC_MAC_PAUSE_TIME_REG, enable);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*hns_xgmac_get_id - get xgmac port id
|
|
||||||
*@mac_drv: mac driver
|
|
||||||
*@newval:xgmac max frame length
|
|
||||||
*/
|
|
||||||
static void hns_xgmac_get_id(void *mac_drv, u8 *mac_id)
|
|
||||||
{
|
|
||||||
struct mac_driver *drv = (struct mac_driver *)mac_drv;
|
|
||||||
|
|
||||||
*mac_id = drv->mac_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*hns_xgmac_config_max_frame_length - set xgmac max frame length
|
*hns_xgmac_config_max_frame_length - set xgmac max frame length
|
||||||
*@mac_drv: mac driver
|
*@mac_drv: mac driver
|
||||||
|
@ -833,7 +821,6 @@ void *hns_xgmac_config(struct hns_mac_cb *mac_cb, struct mac_params *mac_param)
|
||||||
mac_drv->config_half_duplex = NULL;
|
mac_drv->config_half_duplex = NULL;
|
||||||
mac_drv->set_rx_ignore_pause_frames =
|
mac_drv->set_rx_ignore_pause_frames =
|
||||||
hns_xgmac_set_rx_ignore_pause_frames;
|
hns_xgmac_set_rx_ignore_pause_frames;
|
||||||
mac_drv->mac_get_id = hns_xgmac_get_id;
|
|
||||||
mac_drv->mac_free = hns_xgmac_free;
|
mac_drv->mac_free = hns_xgmac_free;
|
||||||
mac_drv->adjust_link = NULL;
|
mac_drv->adjust_link = NULL;
|
||||||
mac_drv->set_tx_auto_pause_frames = hns_xgmac_set_tx_auto_pause_frames;
|
mac_drv->set_tx_auto_pause_frames = hns_xgmac_set_tx_auto_pause_frames;
|
||||||
|
|
Loading…
Reference in New Issue