github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 22:52:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

power: supply: move power_supply_attr_groups definition back to sysfs

Browse Source 
As reported by the kernel test robot, 'power_supply_attr_group' is defined
but not used when CONFIG_SYSFS is not set. Sebastian suggested that the
correct fix implemented by this patch, instead of my attempt in commit
ea4367c40c ("power: supply: core: move power_supply_attr_group into #ifdef
block"), is to define power_supply_attr_groups in power_supply_sysfs.c and
expose it in the power_supply.h header. For the case where CONFIG_SYSFS=n,
define it as NULL.

Suggested-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Fixes: ea4367c40c ("power: supply: core: move power_supply_attr_group into #ifdef block")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202403021518.SUQzk3oA-lkp@intel.com/
Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net>
Link: https://lore.kernel.org/r/20240303-class_cleanup-power-v2-1-e248b7128519@marliere.net
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Ricardo B. Marliere 2024-03-03 13:30:50 -03:00 committed by Sebastian Reichel
parent ea1ec769d1
commit f107e6b823
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/power/supply/power_supply.h
View File

@ -17,12 +17,12 @@ struct power_supply;
extern void power_supply_init_attrs(void);
extern int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env);
extern const struct attribute_group power_supply_attr_group;
extern const struct attribute_group *power_supply_attr_groups[];
#else
static inline void power_supply_init_attrs(void) {}
static const struct attribute_group power_supply_attr_group;
#define power_supply_attr_groups NULL
#define power_supply_uevent NULL
#endif /* CONFIG_SYSFS */

1
drivers/power/supply/power_supply_core.c
View File

@ -32,7 +32,6 @@ static const struct class power_supply_class = {
static BLOCKING_NOTIFIER_HEAD(power_supply_notifier);
__ATTRIBUTE_GROUPS(power_supply_attr);
static const struct device_type power_supply_dev_type = {
.name = "power_supply",
.groups = power_supply_attr_groups,

7
drivers/power/supply/power_supply_sysfs.c
View File

@ -389,11 +389,16 @@ static umode_t power_supply_attr_is_visible(struct kobject *kobj,
return 0;
}
const struct attribute_group power_supply_attr_group = {
static const struct attribute_group power_supply_attr_group = {
.attrs = __power_supply_attrs,
.is_visible = power_supply_attr_is_visible,
};
const struct attribute_group *power_supply_attr_groups[] = {
&power_supply_attr_group,
NULL
};
void power_supply_init_attrs(void)
{
int i;