[PATCH] NET: constify data and function pointer tables

[PATCH] NET: constify data and function pointer tables

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
---
 drivers/net/bonding/bond_main.c         |    2 +-
 drivers/net/hamradio/bpqether.c         |    2 +-
 drivers/net/hamradio/scc.c              |    2 +-
 drivers/net/hamradio/yam.c              |    2 +-
 drivers/net/ibmveth.c                   |    2 +-
 drivers/net/pppoe.c                     |    2 +-
 drivers/net/pppol2tp.c                  |    4 ++--
 drivers/net/wireless/libertas/debugfs.c |   14 +++++++-------
 drivers/net/wireless/strip.c            |    2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b0b2603..ca18eaa 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3252,7 +3252,7 @@ static int bond_info_seq_show(struct seq_file *seq, void *v)
 	return 0;
 }
 
-static struct seq_operations bond_info_seq_ops = {
+static const struct seq_operations bond_info_seq_ops = {
 	.start = bond_info_seq_start,
 	.next  = bond_info_seq_next,
 	.stop  = bond_info_seq_stop,
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 5ddf8b0..a93ad86 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -442,7 +442,7 @@ static int bpq_seq_show(struct seq_file *seq, void *v)
 	return 0;
 }
 
-static struct seq_operations bpq_seqops = {
+static const struct seq_operations bpq_seqops = {
 	.start = bpq_seq_start,
 	.next = bpq_seq_next,
 	.stop = bpq_seq_stop,
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 353d13e..6f1b449 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -2071,7 +2071,7 @@ static int scc_net_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static struct seq_operations scc_net_seq_ops = {
+static const struct seq_operations scc_net_seq_ops = {
 	.start  = scc_net_seq_start,
 	.next   = scc_net_seq_next,
 	.stop   = scc_net_seq_stop,
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 1c94286..797f7a5 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -788,7 +788,7 @@ static int yam_seq_show(struct seq_file *seq, void *v)
 	return 0;
 }
 
-static struct seq_operations yam_seqops = {
+static const struct seq_operations yam_seqops = {
 	.start = yam_seq_start,
 	.next = yam_seq_next,
 	.stop = yam_seq_stop,
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 7d7758f..32800e2 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1300,7 +1300,7 @@ static int ibmveth_seq_show(struct seq_file *seq, void *v)
 
 	return 0;
 }
-static struct seq_operations ibmveth_seq_ops = {
+static const struct seq_operations ibmveth_seq_ops = {
 	.start = ibmveth_seq_start,
 	.next  = ibmveth_seq_next,
 	.stop  = ibmveth_seq_stop,
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index a005d8f..a38e636 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -1026,7 +1026,7 @@ static void pppoe_seq_stop(struct seq_file *seq, void *v)
 	read_unlock_bh(&pppoe_hash_lock);
 }
 
-static struct seq_operations pppoe_seq_ops = {
+static const struct seq_operations pppoe_seq_ops = {
 	.start		= pppoe_seq_start,
 	.next		= pppoe_seq_next,
 	.stop		= pppoe_seq_stop,
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index a7556cd..a8793b3 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -2355,7 +2355,7 @@ out:
 	return 0;
 }
 
-static struct seq_operations pppol2tp_seq_ops = {
+static const struct seq_operations pppol2tp_seq_ops = {
 	.start		= pppol2tp_seq_start,
 	.next		= pppol2tp_seq_next,
 	.stop		= pppol2tp_seq_stop,
@@ -2403,7 +2403,7 @@ static int pppol2tp_proc_release(struct inode *inode, struct file *file)
 	return seq_release(inode, file);
 }
 
-static struct file_operations pppol2tp_proc_fops = {
+static const struct file_operations pppol2tp_proc_fops = {
 	.owner		= THIS_MODULE,
 	.open		= pppol2tp_proc_open,
 	.read		= seq_read,
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 0bda0b5..765c542 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -1569,7 +1569,7 @@ static ssize_t libertas_rdrf_write(struct file *file,
 		res = -EFAULT;
 		goto out_unlock;
 	}
-	priv->rf_offset = simple_strtoul((char *)buf, NULL, 16);
+	priv->rf_offset = simple_strtoul(buf, NULL, 16);
 	res = count;
 out_unlock:
 	free_page(addr);
@@ -1620,12 +1620,12 @@ out_unlock:
 }
 
 struct libertas_debugfs_files {
-	char *name;
+	const char *name;
 	int perm;
 	struct file_operations fops;
 };
 
-static struct libertas_debugfs_files debugfs_files[] = {
+static const struct libertas_debugfs_files debugfs_files[] = {
 	{ "info", 0444, FOPS(libertas_dev_info, write_file_dummy), },
 	{ "getscantable", 0444, FOPS(libertas_getscantable,
 					write_file_dummy), },
@@ -1635,7 +1635,7 @@ static struct libertas_debugfs_files debugfs_files[] = {
 	{ "setuserscan", 0600, FOPS(NULL, libertas_setuserscan), },
 };
 
-static struct libertas_debugfs_files debugfs_events_files[] = {
+static const struct libertas_debugfs_files debugfs_events_files[] = {
 	{"low_rssi", 0644, FOPS(libertas_lowrssi_read,
 				libertas_lowrssi_write), },
 	{"low_snr", 0644, FOPS(libertas_lowsnr_read,
@@ -1650,7 +1650,7 @@ static struct libertas_debugfs_files debugfs_events_files[] = {
 				libertas_highsnr_write), },
 };
 
-static struct libertas_debugfs_files debugfs_regs_files[] = {
+static const struct libertas_debugfs_files debugfs_regs_files[] = {
 	{"rdmac", 0644, FOPS(libertas_rdmac_read, libertas_rdmac_write), },
 	{"wrmac", 0600, FOPS(NULL, libertas_wrmac_write), },
 	{"rdbbp", 0644, FOPS(libertas_rdbbp_read, libertas_rdbbp_write), },
@@ -1677,7 +1677,7 @@ void libertas_debugfs_remove(void)
 void libertas_debugfs_init_one(wlan_private *priv, struct net_device *dev)
 {
 	int i;
-	struct libertas_debugfs_files *files;
+	const struct libertas_debugfs_files *files;
 	if (!libertas_dir)
 		goto exit;
 
@@ -1881,7 +1881,7 @@ static ssize_t wlan_debugfs_write(struct file *f, const char __user *buf,
 	return (ssize_t)cnt;
 }
 
-static struct file_operations libertas_debug_fops = {
+static const struct file_operations libertas_debug_fops = {
 	.owner = THIS_MODULE,
 	.open = open_file_generic,
 	.write = wlan_debugfs_write,
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 88efe1b..cde07c6 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -1149,7 +1149,7 @@ static int strip_seq_show(struct seq_file *seq, void *v)
 }
 
 
-static struct seq_operations strip_seq_ops = {
+static const struct seq_operations strip_seq_ops = {
 	.start = strip_seq_start,
 	.next  = strip_seq_next,
 	.stop  = strip_seq_stop,
-- 
1.5.3.4

[PATCH] [AF_RXRPC]: constify function pointer tables

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
---
 net/rxrpc/ar-call.c     |    2 +-
 net/rxrpc/ar-internal.h |    6 +++---
 net/rxrpc/ar-proc.c     |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
index 3c04b00..d923124 100644
--- a/net/rxrpc/ar-call.c
+++ b/net/rxrpc/ar-call.c
@@ -15,7 +15,7 @@
 #include <net/af_rxrpc.h>
 #include "ar-internal.h"
 
-const char *rxrpc_call_states[] = {
+const char *const rxrpc_call_states[] = {
 	[RXRPC_CALL_CLIENT_SEND_REQUEST]	= "ClSndReq",
 	[RXRPC_CALL_CLIENT_AWAIT_REPLY]		= "ClAwtRpl",
 	[RXRPC_CALL_CLIENT_RECV_REPLY]		= "ClRcvRpl",
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index 58aaf89..1aaa2e8 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -565,9 +565,9 @@ extern void __exit rxrpc_destroy_all_peers(void);
 /*
  * ar-proc.c
  */
-extern const char *rxrpc_call_states[];
-extern struct file_operations rxrpc_call_seq_fops;
-extern struct file_operations rxrpc_connection_seq_fops;
+extern const char *const rxrpc_call_states[];
+extern const struct file_operations rxrpc_call_seq_fops;
+extern const struct file_operations rxrpc_connection_seq_fops;
 
 /*
  * ar-recvmsg.c
diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
index 2e83ce3..83eda24 100644
--- a/net/rxrpc/ar-proc.c
+++ b/net/rxrpc/ar-proc.c
@@ -14,7 +14,7 @@
 #include <net/af_rxrpc.h>
 #include "ar-internal.h"
 
-static const char *rxrpc_conn_states[] = {
+static const char *const rxrpc_conn_states[] = {
 	[RXRPC_CONN_UNUSED]		= "Unused  ",
 	[RXRPC_CONN_CLIENT]		= "Client  ",
 	[RXRPC_CONN_SERVER_UNSECURED]	= "SvUnsec ",
@@ -98,7 +98,7 @@ static int rxrpc_call_seq_open(struct inode *inode, struct file *file)
 	return seq_open(file, &rxrpc_call_seq_ops);
 }
 
-struct file_operations rxrpc_call_seq_fops = {
+const struct file_operations rxrpc_call_seq_fops = {
 	.owner		= THIS_MODULE,
 	.open		= rxrpc_call_seq_open,
 	.read		= seq_read,
@@ -183,7 +183,7 @@ static int rxrpc_connection_seq_open(struct inode *inode, struct file *file)
 	return seq_open(file, &rxrpc_connection_seq_ops);
 }
 
-struct file_operations rxrpc_connection_seq_fops = {
+const struct file_operations rxrpc_connection_seq_fops = {
 	.owner		= THIS_MODULE,
 	.open		= rxrpc_connection_seq_open,
 	.read		= seq_read,
-- 
1.5.3.4

[PATCH] [AF_X25]: constify function pointer tables

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
---
 net/x25/x25_proc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
index 7d55e50..3faec8e 100644
--- a/net/x25/x25_proc.c
+++ b/net/x25/x25_proc.c
@@ -287,7 +287,7 @@ static const struct file_operations x25_seq_route_fops = {
 	.release	= seq_release,
 };
 
-static struct file_operations x25_seq_forward_fops = {
+static const struct file_operations x25_seq_forward_fops = {
 	.owner		= THIS_MODULE,
 	.open		= x25_seq_forward_open,
 	.read		= seq_read,
-- 
1.5.3.4

Re: [PATCH] [AF_X25]: constify function pointer tables

[David Miller]

From: Jan Engelhardt <jengelh@computergmbh.de>
Date: Tue, 22 Jan 2008 20:52:04 +0100 (CET)

> Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>

Applied.

Re: [PATCH] NET: constify data and function pointer tables

[Jeff Garzik]

Jan Engelhardt wrote:
> Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
> ---
>  drivers/net/bonding/bond_main.c         |    2 +-
>  drivers/net/hamradio/bpqether.c         |    2 +-
>  drivers/net/hamradio/scc.c              |    2 +-
>  drivers/net/hamradio/yam.c              |    2 +-
>  drivers/net/ibmveth.c                   |    2 +-
>  drivers/net/pppoe.c                     |    2 +-
>  drivers/net/pppol2tp.c                  |    4 ++--
>  drivers/net/wireless/libertas/debugfs.c |   14 +++++++-------
>  drivers/net/wireless/strip.c            |    2 +-
>  9 files changed, 16 insertions(+), 16 deletions(-)

ACK -- but you should collect linville's ack of the wireless stuff too 
(even though the patch is simple and obvious)

Re: [PATCH] NET: constify data and function pointer tables

[John W. Linville]

On Wed, Jan 30, 2008 at 04:25:17AM -0500, Jeff Garzik wrote:
> Jan Engelhardt wrote:
>> Signed-off-by: Jan Engelhardt <jengelh-bdq14YP6qtRlEiWPh9xO2Q@public.gmane.org>
>> ---
>>  drivers/net/bonding/bond_main.c         |    2 +-
>>  drivers/net/hamradio/bpqether.c         |    2 +-
>>  drivers/net/hamradio/scc.c              |    2 +-
>>  drivers/net/hamradio/yam.c              |    2 +-
>>  drivers/net/ibmveth.c                   |    2 +-
>>  drivers/net/pppoe.c                     |    2 +-
>>  drivers/net/pppol2tp.c                  |    4 ++--
>>  drivers/net/wireless/libertas/debugfs.c |   14 +++++++-------
>>  drivers/net/wireless/strip.c            |    2 +-
>>  9 files changed, 16 insertions(+), 16 deletions(-)
>
> ACK -- but you should collect linville's ack of the wireless stuff too 
> (even though the patch is simple and obvious)

Looks fine to me...ACK

-- 
John W. Linville
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org

Re: [PATCH] [AF_RXRPC]: constify function pointer tables

[David Miller]

From: Jan Engelhardt <jengelh@computergmbh.de>
Date: Tue, 22 Jan 2008 20:47:51 +0100 (CET)

> Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>

Applied, thanks.