Re: linux-next: driver-core tree build warning

[David Brownell]

On Monday 13 July 2009, Greg KH wrote:
> David, care to send patches fixing these warnings?

Here's a single patch:

=================== CUT HERE
From: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>

Some more attribute group pointers need to become const-friendly:

drivers/firewire/core-device.c:315: warning: assignment from incompatible pointer type
drivers/mtd/mtdcore.c:227: warning: initialization from incompatible pointer type
drivers/block/cciss.c:582: warning: initialization from incompatible pointer type

Two of these post-date the original constification patch; not sure
how I missed Firewire the first time.

Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
---
 drivers/block/cciss.c          |    2 +-
 drivers/firewire/core-device.c |    2 +-
 drivers/mtd/mtdcore.c          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -572,7 +572,7 @@ static struct attribute_group cciss_dev_
 	.attrs = cciss_dev_attrs,
 };
 
-static struct attribute_group *cciss_dev_attr_groups[] = {
+static const struct attribute_group *cciss_dev_attr_groups[] = {
 	&cciss_dev_attr_group,
 	NULL
 };
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -312,7 +312,7 @@ static void init_fw_attribute_group(stru
 	group->groups[0] = &group->group;
 	group->groups[1] = NULL;
 	group->group.attrs = group->attrs;
-	dev->groups = group->groups;
+	dev->groups = (const struct attribute_group **) group->groups;
 }
 
 static ssize_t modalias_show(struct device *dev,
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -217,7 +217,7 @@ struct attribute_group mtd_group = {
 	.attrs		= mtd_attrs,
 };
 
-struct attribute_group *mtd_groups[] = {
+struct const attribute_group *mtd_groups[] = {
 	&mtd_group,
 	NULL,
 };

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/