Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc6f0136 authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

net: hisilicon: constify ethtool_ops structures 

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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 70591ab9

drivers/net/ethernet/hisilicon/hip04_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/hisilicon/hisi_femac.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/hisilicon/hix5hd2_gmac.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/hisilicon/hns/hns_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -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,