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

Commit a4dbd674 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

driver model: constify attribute groups 



Let attribute group vectors be declared "const".  We'd
like to let most attribute metadata live in read-only
sections... this is a start.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5b2ea2f1

block/genhd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -903,7 +903,7 @@ static struct attribute_group disk_attr_group = { 
	.attrs = disk_attrs,

	.attrs = disk_attrs,

};

};





static struct attribute_group *disk_attr_groups[] = {

static const struct attribute_group *disk_attr_groups[] = {

	&disk_attr_group,

	&disk_attr_group,

	NULL

	NULL

};

};

drivers/base/core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -341,7 +341,7 @@ static void device_remove_attributes(struct device *dev, 
}

}





static int device_add_groups(struct device *dev,

static int device_add_groups(struct device *dev,

			     struct attribute_group **groups)

			     const struct attribute_group **groups)

{

{

	int error = 0;

	int error = 0;

	int i;

	int i;
@@ -361,7 +361,7 @@ static int device_add_groups(struct device *dev, 
}

}





static void device_remove_groups(struct device *dev,

static void device_remove_groups(struct device *dev,

				 struct attribute_group **groups)

				 const struct attribute_group **groups)

{

{

	int i;

	int i;

drivers/base/driver.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -181,7 +181,7 @@ void put_driver(struct device_driver *drv) 
EXPORT_SYMBOL_GPL(put_driver);

EXPORT_SYMBOL_GPL(put_driver);





static int driver_add_groups(struct device_driver *drv,

static int driver_add_groups(struct device_driver *drv,

			     struct attribute_group **groups)

			     const struct attribute_group **groups)

{

{

	int error = 0;

	int error = 0;

	int i;

	int i;
@@ -201,7 +201,7 @@ static int driver_add_groups(struct device_driver *drv, 
}

}





static void driver_remove_groups(struct device_driver *drv,

static void driver_remove_groups(struct device_driver *drv,

				 struct attribute_group **groups)

				 const struct attribute_group **groups)

{

{

	int i;

	int i;

drivers/block/cciss.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -572,7 +572,7 @@ static struct attribute_group cciss_dev_attr_group = { 
	.attrs = cciss_dev_attrs,

	.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,

	&cciss_dev_attr_group,

	NULL

	NULL

};

};

drivers/firewire/core-device.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -312,7 +312,7 @@ static void init_fw_attribute_group(struct device *dev, 
	group->groups[0] = &group->group;

	group->groups[0] = &group->group;

	group->groups[1] = NULL;

	group->groups[1] = NULL;

	group->group.attrs = group->attrs;

	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,

static ssize_t modalias_show(struct device *dev,