[PATCH] net/s390 drivers: add missing 'const' attribute

[PATCH] net/s390 drivers: add missing 'const' attribute

[Heiko Carstens]

Subject: [PATCH] net/s390 drivers: add missing 'const' attribute

From: Heiko Carstens <heiko.carstens@de.ibm.com>

Add missing 'const' attribute to avoid the following compile warnings:

drivers/s390/net/ctcm_main.c: In function 'ctcm_init':
drivers/s390/net/ctcm_main.c:1864: warning: assignment from incompatible pointer type
drivers/s390/net/lcs.c: In function 'lcs_init_module':
drivers/s390/net/lcs.c:2468: warning: assignment from incompatible pointer type
drivers/s390/net/claw.c: In function 'claw_init':
drivers/s390/net/claw.c:3408: warning: assignment from incompatible pointer type

Cc: Ursula Braun <braunu@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---

Patch applies on top of linux-next of 17th November.

 drivers/s390/net/claw.c      |    2 +-
 drivers/s390/net/ctcm_main.c |    2 +-
 drivers/s390/net/lcs.c       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-next/drivers/s390/net/ctcm_main.c
===================================================================
--- linux-next.orig/drivers/s390/net/ctcm_main.c
+++ linux-next/drivers/s390/net/ctcm_main.c
@@ -1806,7 +1806,7 @@ static struct attribute_group ctcm_group
 	.attrs = ctcm_group_attrs,
 };
 
-static struct attribute_group *ctcm_group_attr_groups[] = {
+static const struct attribute_group *ctcm_group_attr_groups[] = {
 	&ctcm_group_attr_group,
 	NULL,
 };
Index: linux-next/drivers/s390/net/lcs.c
===================================================================
--- linux-next.orig/drivers/s390/net/lcs.c
+++ linux-next/drivers/s390/net/lcs.c
@@ -2440,7 +2440,7 @@ static struct attribute_group lcs_group_
 	.attrs = lcs_group_attrs,
 };
 
-static struct attribute_group *lcs_group_attr_groups[] = {
+static const struct attribute_group *lcs_group_attr_groups[] = {
 	&lcs_group_attr_group,
 	NULL,
 };
Index: linux-next/drivers/s390/net/claw.c
===================================================================
--- linux-next.orig/drivers/s390/net/claw.c
+++ linux-next/drivers/s390/net/claw.c
@@ -310,7 +310,7 @@ static struct attribute_group claw_group
 	.attrs = claw_group_attrs,
 };
 
-static struct attribute_group *claw_group_attr_groups[] = {
+static const struct attribute_group *claw_group_attr_groups[] = {
 	&claw_group_attr_group,
 	NULL,
 };

Re: [PATCH] net/s390 drivers: add missing 'const' attribute

[David Miller]

From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 17 Nov 2009 14:48:15 +0100

> Add missing 'const' attribute to avoid the following compile warnings:
> 
> drivers/s390/net/ctcm_main.c: In function 'ctcm_init':
> drivers/s390/net/ctcm_main.c:1864: warning: assignment from incompatible pointer type
> drivers/s390/net/lcs.c: In function 'lcs_init_module':
> drivers/s390/net/lcs.c:2468: warning: assignment from incompatible pointer type
> drivers/s390/net/claw.c: In function 'claw_init':
> drivers/s390/net/claw.c:3408: warning: assignment from incompatible pointer type
> 
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

Applied to net-next-2.6, thank you.