Merge branch 'atlantic-static'
zhengbin says: ==================== net: atlantic: make some symbol & function static v1->v2: add Fixes tag ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
13eef6fc2c
|
@ -703,14 +703,14 @@ static void aq_set_msg_level(struct net_device *ndev, u32 data)
|
|||
aq_nic->msg_enable = data;
|
||||
}
|
||||
|
||||
u32 aq_ethtool_get_priv_flags(struct net_device *ndev)
|
||||
static u32 aq_ethtool_get_priv_flags(struct net_device *ndev)
|
||||
{
|
||||
struct aq_nic_s *aq_nic = netdev_priv(ndev);
|
||||
|
||||
return aq_nic->aq_nic_cfg.priv_flags;
|
||||
}
|
||||
|
||||
int aq_ethtool_set_priv_flags(struct net_device *ndev, u32 flags)
|
||||
static int aq_ethtool_set_priv_flags(struct net_device *ndev, u32 flags)
|
||||
{
|
||||
struct aq_nic_s *aq_nic = netdev_priv(ndev);
|
||||
struct aq_nic_cfg_s *cfg;
|
||||
|
|
|
@ -423,7 +423,7 @@ static int aq_pm_resume_restore(struct device *dev)
|
|||
return atl_resume_common(dev, true);
|
||||
}
|
||||
|
||||
const struct dev_pm_ops aq_pm_ops = {
|
||||
static const struct dev_pm_ops aq_pm_ops = {
|
||||
.suspend = aq_pm_suspend_poweroff,
|
||||
.poweroff = aq_pm_suspend_poweroff,
|
||||
.freeze = aq_pm_freeze,
|
||||
|
|
Loading…
Reference in New Issue