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

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

drivers: net: xgene: constify xgene_mac_ops and xgene_port_ops structures 



The xgene_mac_ops and xgene_port_ops structures are never modified, so
declare them as const.

Done with the help of Coccinelle.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e370abd9

drivers/net/ethernet/apm/xgene/xgene_enet_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ void xgene_enet_mdio_remove(struct xgene_enet_pdata *pdata) 
	pdata->mdio_bus = NULL;

}



struct xgene_mac_ops xgene_gmac_ops = {

const struct xgene_mac_ops xgene_gmac_ops = {

	.init = xgene_gmac_init,

	.reset = xgene_gmac_reset,

	.rx_enable = xgene_gmac_rx_enable,
@@ -879,7 +879,7 @@ struct xgene_mac_ops xgene_gmac_ops = { 
	.set_mac_addr = xgene_gmac_set_mac_addr,

};



struct xgene_port_ops xgene_gport_ops = {

const struct xgene_port_ops xgene_gport_ops = {

	.reset = xgene_enet_reset,

	.cle_bypass = xgene_enet_cle_bypass,

	.shutdown = xgene_gport_shutdown,

drivers/net/ethernet/apm/xgene/xgene_enet_hw.h

+2 −2
Original line number Diff line number Diff line
@@ -340,8 +340,8 @@ int xgene_enet_mdio_config(struct xgene_enet_pdata *pdata); 
void xgene_enet_mdio_remove(struct xgene_enet_pdata *pdata);

bool xgene_ring_mgr_init(struct xgene_enet_pdata *p);



extern struct xgene_mac_ops xgene_gmac_ops;

extern struct xgene_port_ops xgene_gport_ops;

extern const struct xgene_mac_ops xgene_gmac_ops;

extern const struct xgene_port_ops xgene_gport_ops;

extern struct xgene_ring_ops xgene_ring1_ops;



#endif /* __XGENE_ENET_HW_H__ */

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

+4 −4
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ static void xgene_enet_napi_disable(struct xgene_enet_pdata *pdata) 
static int xgene_enet_open(struct net_device *ndev)

{

	struct xgene_enet_pdata *pdata = netdev_priv(ndev);

	struct xgene_mac_ops *mac_ops = pdata->mac_ops;

	const struct xgene_mac_ops *mac_ops = pdata->mac_ops;

	int ret;



	mac_ops->tx_enable(pdata);
@@ -706,7 +706,7 @@ static int xgene_enet_open(struct net_device *ndev) 
static int xgene_enet_close(struct net_device *ndev)

{

	struct xgene_enet_pdata *pdata = netdev_priv(ndev);

	struct xgene_mac_ops *mac_ops = pdata->mac_ops;

	const struct xgene_mac_ops *mac_ops = pdata->mac_ops;



	netif_stop_queue(ndev);
@@ -1416,7 +1416,7 @@ static int xgene_enet_probe(struct platform_device *pdev) 
	struct net_device *ndev;

	struct xgene_enet_pdata *pdata;

	struct device *dev = &pdev->dev;

	struct xgene_mac_ops *mac_ops;

	const struct xgene_mac_ops *mac_ops;

	const struct of_device_id *of_id;

	int ret;
@@ -1503,7 +1503,7 @@ static int xgene_enet_probe(struct platform_device *pdev) 
static int xgene_enet_remove(struct platform_device *pdev)

{

	struct xgene_enet_pdata *pdata;

	struct xgene_mac_ops *mac_ops;

	const struct xgene_mac_ops *mac_ops;

	struct net_device *ndev;



	pdata = platform_get_drvdata(pdev);

drivers/net/ethernet/apm/xgene/xgene_enet_main.h

+2 −2
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ struct xgene_enet_pdata { 
	int phy_mode;

	enum xgene_enet_rm rm;

	struct rtnl_link_stats64 stats;

	struct xgene_mac_ops *mac_ops;

	struct xgene_port_ops *port_ops;

	const struct xgene_mac_ops *mac_ops;

	const struct xgene_port_ops *port_ops;

	struct xgene_ring_ops *ring_ops;

	struct delayed_work link_work;

	u32 port_id;

drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c

+2 −2
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static void xgene_enet_link_state(struct work_struct *work) 
	schedule_delayed_work(&p->link_work, poll_interval);

}



struct xgene_mac_ops xgene_sgmac_ops = {

const struct xgene_mac_ops xgene_sgmac_ops = {

	.init		= xgene_sgmac_init,

	.reset		= xgene_sgmac_reset,

	.rx_enable	= xgene_sgmac_rx_enable,
@@ -416,7 +416,7 @@ struct xgene_mac_ops xgene_sgmac_ops = { 
	.link_state	= xgene_enet_link_state

};



struct xgene_port_ops xgene_sgport_ops = {

const struct xgene_port_ops xgene_sgport_ops = {

	.reset		= xgene_enet_reset,

	.cle_bypass	= xgene_enet_cle_bypass,

	.shutdown	= xgene_enet_shutdown