[PATCH 0/3] more cleanups

STALE5332d

5 messages, 2 authors, 2012-01-09 · open the first message on its own page

[PATCH 0/3] more cleanups

From: Stephen Hemminger <hidden>
Date: 2012-01-06 05:16:40

Just found more places where function tables should be const.

[PATCH 2/3] bcm63xx: make ethtool_ops const

From: Stephen Hemminger <hidden>
Date: 2012-01-06 05:16:40

Signed-off-by: Stephen Hemminger <redacted>
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c	2011-12-07 10:54:18.688278133 -0800
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c	2012-01-04 14:19:01.945391195 -0800
@@ -1469,7 +1469,7 @@ static int bcm_enet_set_pauseparam(struc
 	return 0;
 }
 
-static struct ethtool_ops bcm_enet_ethtool_ops = {
+static const struct ethtool_ops bcm_enet_ethtool_ops = {
 	.get_strings		= bcm_enet_get_strings,
 	.get_sset_count		= bcm_enet_get_sset_count,
 	.get_ethtool_stats      = bcm_enet_get_ethtool_stats,

[PATCH 1/3] usbnet: make ethtool_ops const

From: Stephen Hemminger <hidden>
Date: 2012-01-06 05:16:40

The ethtool_ops table of function pointers should be const.
Fix all the usb network drivers.

Signed-off-by: Stephen Hemminger <redacted>

---
Not sure if you want these through net-next or usb-next?

 drivers/net/usb/asix.c       |    2 +-
 drivers/net/usb/cdc_ncm.c    |    4 ++--
 drivers/net/usb/ipheth.c     |    2 +-
 drivers/net/usb/sierra_net.c |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
--- a/drivers/net/usb/asix.c	2011-12-23 21:06:15.724436897 -0800
+++ b/drivers/net/usb/asix.c	2012-01-04 14:12:38.832942290 -0800
@@ -1152,7 +1152,7 @@ static int ax88772_bind(struct usbnet *d
 	return 0;
 }
 
-static struct ethtool_ops ax88178_ethtool_ops = {
+static const struct ethtool_ops ax88178_ethtool_ops = {
 	.get_drvinfo		= asix_get_drvinfo,
 	.get_link		= asix_get_link,
 	.get_msglevel		= usbnet_get_msglevel,
--- a/drivers/net/usb/cdc_ncm.c	2011-12-07 10:54:18.960280313 -0800
+++ b/drivers/net/usb/cdc_ncm.c	2012-01-04 14:12:17.648667526 -0800
@@ -138,7 +138,7 @@ struct cdc_ncm_ctx {
 static void cdc_ncm_tx_timeout(unsigned long arg);
 static const struct driver_info cdc_ncm_info;
 static struct usb_driver cdc_ncm_driver;
-static struct ethtool_ops cdc_ncm_ethtool_ops;
+static const struct ethtool_ops cdc_ncm_ethtool_ops;
 
 static const struct usb_device_id cdc_devs[] = {
 	{ USB_INTERFACE_INFO(USB_CLASS_COMM,
@@ -1220,7 +1220,7 @@ static struct usb_driver cdc_ncm_driver
 	.supports_autosuspend = 1,
 };
 
-static struct ethtool_ops cdc_ncm_ethtool_ops = {
+static const struct ethtool_ops cdc_ncm_ethtool_ops = {
 	.get_drvinfo = cdc_ncm_get_drvinfo,
 	.get_link = usbnet_get_link,
 	.get_msglevel = usbnet_get_msglevel,
--- a/drivers/net/usb/ipheth.c	2011-12-07 10:54:18.964280345 -0800
+++ b/drivers/net/usb/ipheth.c	2012-01-04 14:12:01.008460107 -0800
@@ -420,7 +420,7 @@ static u32 ipheth_ethtool_op_get_link(st
 	return netif_carrier_ok(dev->net);
 }
 
-static struct ethtool_ops ops = {
+static const struct ethtool_ops ops = {
 	.get_link = ipheth_ethtool_op_get_link
 };
 
--- a/drivers/net/usb/sierra_net.c	2011-12-07 10:54:18.968280377 -0800
+++ b/drivers/net/usb/sierra_net.c	2012-01-04 14:11:19.368146426 -0800
@@ -618,7 +618,7 @@ static u32 sierra_net_get_link(struct ne
 	return sierra_net_get_private(dev)->link_up && netif_running(net);
 }
 
-static struct ethtool_ops sierra_net_ethtool_ops = {
+static const struct ethtool_ops sierra_net_ethtool_ops = {
 	.get_drvinfo = sierra_net_get_drvinfo,
 	.get_link = sierra_net_get_link,
 	.get_msglevel = usbnet_get_msglevel,

[PATCH 3/3] netdev: make net_device_ops const

From: Stephen Hemminger <hidden>
Date: 2012-01-06 05:16:40

More drivers where net_device_ops should be const.

Signed-off-by: Stephen Hemminger <redacted>

---
 drivers/net/ethernet/emulex/benet/be_main.c |    2 +-
 drivers/net/ethernet/tile/tilepro.c         |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
--- a/drivers/net/ethernet/emulex/benet/be_main.c	2012-01-03 08:06:38.418232216 -0800
+++ b/drivers/net/ethernet/emulex/benet/be_main.c	2012-01-05 08:17:04.567161286 -0800
@@ -3080,7 +3080,7 @@ fw_exit:
 	return status;
 }
 
-static struct net_device_ops be_netdev_ops = {
+static const struct net_device_ops be_netdev_ops = {
 	.ndo_open		= be_open,
 	.ndo_stop		= be_close,
 	.ndo_start_xmit		= be_xmit,
--- a/drivers/net/ethernet/tile/tilepro.c	2011-12-23 21:06:15.724436897 -0800
+++ b/drivers/net/ethernet/tile/tilepro.c	2012-01-05 08:16:03.870511570 -0800
@@ -2260,8 +2260,7 @@ static int tile_net_get_mac(struct net_d
 	return 0;
 }
 
-
-static struct net_device_ops tile_net_ops = {
+static const struct net_device_ops tile_net_ops = {
 	.ndo_open = tile_net_open,
 	.ndo_stop = tile_net_stop,
 	.ndo_start_xmit = tile_net_tx,

Re: [PATCH 0/3] more cleanups

From: David Miller <davem@davemloft.net>
Date: 2012-01-09 22:05:48

From: Stephen Hemminger <redacted>
Date: Thu, 05 Jan 2012 21:10:22 -0800
Just found more places where function tables should be const.
All applied, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help