Commit 7b46b609 authored by Ricardo B. Marliere's avatar Ricardo B. Marliere Committed by Sebastian Reichel
Browse files

power: supply: core: constify the struct device_type usage 



Since commit aed65af1 ("drivers: make device_type const"), the driver
core can properly handle constant struct device_type. Move the
power_supply_dev_type variable to be a constant structure as well, placing
it into read-only memory which can not be modified at runtime.

In order to accomplish that, export power_supply_attr_group in
power_supply.h and use it with the macro __ATTRIBUTE_GROUPS when defining
power_supply_dev_type in power_supply_core.c. Therefore the attribute group
is no longer static. Lastly, because power_supply_attr_groups is no longer
dynamically associated to power_supply_dev_type in
power_supply_init_attrs(), make the function receive zero arguments.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarRicardo B. Marliere <ricardo@marliere.net>
Link: https://lore.kernel.org/r/20240224-device_cleanup-power-v2-1-465ff94b896c@marliere.net


Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 9e6047c0

drivers/power/supply/power_supply.h

+3 −1
Original line number Diff line number Diff line
@@ -13,9 +13,11 @@ struct device; 
struct device_type;

struct power_supply;



extern const struct attribute_group power_supply_attr_group;



#ifdef CONFIG_SYSFS



extern void power_supply_init_attrs(struct device_type *dev_type);

extern void power_supply_init_attrs(void);

extern int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env);



#else

drivers/power/supply/power_supply_core.c

+6 −2
Original line number Diff line number Diff line
@@ -31,7 +31,11 @@ EXPORT_SYMBOL_GPL(power_supply_class); 


static BLOCKING_NOTIFIER_HEAD(power_supply_notifier);



static struct device_type power_supply_dev_type;

__ATTRIBUTE_GROUPS(power_supply_attr);

static const struct device_type power_supply_dev_type = {

	.name = "power_supply",

	.groups = power_supply_attr_groups,

};



#define POWER_SUPPLY_DEFERRED_REGISTER_TIME	msecs_to_jiffies(10)
@@ -1623,7 +1627,7 @@ static int __init power_supply_class_init(void) 
		return PTR_ERR(power_supply_class);



	power_supply_class->dev_uevent = power_supply_uevent;

	power_supply_init_attrs(&power_supply_dev_type);

	power_supply_init_attrs();



	return 0;

}

drivers/power/supply/power_supply_sysfs.c

+2 −9
Original line number Diff line number Diff line
@@ -389,22 +389,15 @@ static umode_t power_supply_attr_is_visible(struct kobject *kobj, 
	return 0;

}



static const struct attribute_group power_supply_attr_group = {

const struct attribute_group power_supply_attr_group = {

	.attrs = __power_supply_attrs,

	.is_visible = power_supply_attr_is_visible,

};



static const struct attribute_group *power_supply_attr_groups[] = {

	&power_supply_attr_group,

	NULL,

};



void power_supply_init_attrs(struct device_type *dev_type)

void power_supply_init_attrs(void)

{

	int i;



	dev_type->groups = power_supply_attr_groups;



	for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++) {

		struct device_attribute *attr;