Merge branch 'atlantic-static'

davem330 · davem330 · commit 13eef6fc2c1f · 2019-11-12T10:55:41.000-08:00
zhengbin says:

====================
net: atlantic: make some symbol &amp; function static

v1-&gt;v2: add Fixes tag
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
@@ -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;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -703,14 +703,14 @@ static void aq_set_msg_level(struct net_device *ndev, u32 data)`
`703`	`703`	`aq_nic->msg_enable = data;`
`704`	`704`	`}`
`705`	`705`
`706`		`-u32 aq_ethtool_get_priv_flags(struct net_device *ndev)`
	`706`	`+static u32 aq_ethtool_get_priv_flags(struct net_device *ndev)`
`707`	`707`	`{`
`708`	`708`	`struct aq_nic_s *aq_nic = netdev_priv(ndev);`
`709`	`709`
`710`	`710`	`return aq_nic->aq_nic_cfg.priv_flags;`
`711`	`711`	`}`
`712`	`712`
`713`		`-int aq_ethtool_set_priv_flags(struct net_device *ndev, u32 flags)`
	`713`	`+static int aq_ethtool_set_priv_flags(struct net_device *ndev, u32 flags)`
`714`	`714`	`{`
`715`	`715`	`struct aq_nic_s *aq_nic = netdev_priv(ndev);`
`716`	`716`	`struct aq_nic_cfg_s *cfg;`
Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ static int aq_pm_resume_restore(struct device *dev)`
`423`	`423`	`return atl_resume_common(dev, true);`
`424`	`424`	`}`
`425`	`425`
`426`		`-const struct dev_pm_ops aq_pm_ops = {`
	`426`	`+static const struct dev_pm_ops aq_pm_ops = {`
`427`	`427`	`.suspend = aq_pm_suspend_poweroff,`
`428`	`428`	`.poweroff = aq_pm_suspend_poweroff,`
`429`	`429`	`.freeze = aq_pm_freeze,`