Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1473153

[PATCH 4/6] net: hisilicon: constify ethtool_ops structures

Show all headers | View raw

Check for ethtool_ops structures that are only stored in the ethtool_ops
field of a net_device structure or passed as the second argument to
netdev_set_default_ethtool_ops.  These contexts are declared const, so
ethtool_ops structures that have these properties can be declared as const
also.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r disable optional_qualifier@
identifier i;
position p;
@@
static struct ethtool_ops i@p = { ... };

@ok1@
identifier r.i;
struct net_device e;
position p;
@@
e.ethtool_ops = &i@p;

@ok2@
identifier r.i;
expression e;
position p;
@@
netdev_set_default_ethtool_ops(e, &i@p)

@bad@
position p != {r.p,ok1.p,ok2.p};
identifier r.i;
@@
i@p

@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
 struct ethtool_ops i = { ... };
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
 drivers/net/ethernet/hisilicon/hip04_eth.c       |    2 +-
 drivers/net/ethernet/hisilicon/hisi_femac.c      |    2 +-
 drivers/net/ethernet/hisilicon/hix5hd2_gmac.c    |    2 +-
 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c
index 0c4afe9..a90ab40 100644
--- a/drivers/net/ethernet/hisilicon/hip04_eth.c
+++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
@@ -755,7 +755,7 @@ static void hip04_get_drvinfo(struct net_device *netdev,
 	strlcpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version));
 }
 
-static struct ethtool_ops hip04_ethtool_ops = {
+static const struct ethtool_ops hip04_ethtool_ops = {
 	.get_coalesce		= hip04_get_coalesce,
 	.set_coalesce		= hip04_set_coalesce,
 	.get_drvinfo		= hip04_get_drvinfo,
diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c
index b5d7ad0..ca68e22 100644
--- a/drivers/net/ethernet/hisilicon/hisi_femac.c
+++ b/drivers/net/ethernet/hisilicon/hisi_femac.c
@@ -699,7 +699,7 @@ static int hisi_femac_net_ioctl(struct net_device *dev,
 	return phy_mii_ioctl(dev->phydev, ifreq, cmd);
 }
 
-static struct ethtool_ops hisi_femac_ethtools_ops = {
+static const struct ethtool_ops hisi_femac_ethtools_ops = {
 	.get_link		= ethtool_op_get_link,
 	.get_link_ksettings	= phy_ethtool_get_link_ksettings,
 	.set_link_ksettings	= phy_ethtool_set_link_ksettings,
diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
index 275618b..e69a6be 100644
--- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
+++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
@@ -750,7 +750,7 @@ static const struct net_device_ops hix5hd2_netdev_ops = {
 	.ndo_set_mac_address	= hix5hd2_net_set_mac_address,
 };
 
-static struct ethtool_ops hix5hd2_ethtools_ops = {
+static const struct ethtool_ops hix5hd2_ethtools_ops = {
 	.get_link		= ethtool_op_get_link,
 	.get_link_ksettings     = phy_ethtool_get_link_ksettings,
 	.set_link_ksettings     = phy_ethtool_set_link_ksettings,
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index ab33487..5eb3245 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -1264,7 +1264,7 @@ static int hns_get_rxnfc(struct net_device *netdev,
 	return 0;
 }
 
-static struct ethtool_ops hns_ethtool_ops = {
+static const struct ethtool_ops hns_ethtool_ops = {
 	.get_drvinfo = hns_nic_get_drvinfo,
 	.get_link  = hns_nic_get_link,
 	.get_settings  = hns_nic_get_settings,

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] constify ethtool_ops structures Julia Lawall <Julia.Lawall@lip6.fr> - 2016-08-31 09:50 +0200
  [PATCH 2/6] net: ethernet: et131x: constify ethtool_ops structures Julia Lawall <Julia.Lawall@lip6.fr> - 2016-08-31 09:50 +0200
    Re: [PATCH 2/6] net: ethernet: et131x: constify ethtool_ops  structures Mark Einon <mark@einon.net> - 2016-08-31 13:50 +0200
  [PATCH 6/6] net: systemport: constify ethtool_ops structures Julia Lawall <Julia.Lawall@lip6.fr> - 2016-08-31 09:50 +0200
    Re: [PATCH 6/6] net: systemport: constify ethtool_ops structures Florian Fainelli <f.fainelli@gmail.com> - 2016-08-31 19:10 +0200
  [PATCH 3/6] net: bcmgenet: constify ethtool_ops structures Julia Lawall <Julia.Lawall@lip6.fr> - 2016-08-31 09:50 +0200
    Re: [PATCH 3/6] net: bcmgenet: constify ethtool_ops structures Florian Fainelli <f.fainelli@gmail.com> - 2016-08-31 19:10 +0200
  [PATCH 5/6] dwc_eth_qos: constify ethtool_ops structures Julia Lawall <Julia.Lawall@lip6.fr> - 2016-08-31 10:00 +0200
  [PATCH 1/6] staging: slicoss: constify ethtool_ops structures Julia Lawall <Julia.Lawall@lip6.fr> - 2016-08-31 10:00 +0200
  [PATCH 4/6] net: hisilicon: constify ethtool_ops structures Julia Lawall <Julia.Lawall@lip6.fr> - 2016-08-31 10:00 +0200
  Re: [PATCH 0/6] constify ethtool_ops structures Stephen Hemminger <stephen@networkplumber.org> - 2016-08-31 17:40 +0200
    Re: [PATCH 0/6] constify ethtool_ops structures Julia Lawall <julia.lawall@lip6.fr> - 2016-08-31 21:50 +0200
  Re: [PATCH 0/6] constify ethtool_ops structures David Miller <davem@davemloft.net> - 2016-08-31 18:30 +0200

csiph-web