Commit eafb1a86 authored by Zijun Hu's avatar Zijun Hu Committed by Greg Kroah-Hartman
Browse files

driver core: Put device attribute @wakeup_last_time_ms and its show() together 



Move location of dpm_sysfs_wakeup_change_owner() a bit to

- Put device attribute @wakeup_last_time_ms and its show() together.
- Put two different instances of dpm_sysfs_wakeup_change_owner() together.

That will make better code layout.

Signed-off-by: default avatarZijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20241028-fix_power_sysfs-v1-1-7b2fbeb14d47@quicinc.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f87f132c

drivers/base/power/sysfs.c

+9 −8
Original line number Diff line number Diff line
@@ -509,14 +509,6 @@ static ssize_t wakeup_last_time_ms_show(struct device *dev, 
	return sysfs_emit(buf, "%lld\n", msec);

}



static inline int dpm_sysfs_wakeup_change_owner(struct device *dev, kuid_t kuid,

						kgid_t kgid)

{

	if (dev->power.wakeup && dev->power.wakeup->dev)

		return device_change_owner(dev->power.wakeup->dev, kuid, kgid);

	return 0;

}



static DEVICE_ATTR_RO(wakeup_last_time_ms);



#ifdef CONFIG_PM_AUTOSLEEP
@@ -541,6 +533,15 @@ static ssize_t wakeup_prevent_sleep_time_ms_show(struct device *dev, 


static DEVICE_ATTR_RO(wakeup_prevent_sleep_time_ms);

#endif /* CONFIG_PM_AUTOSLEEP */



static inline int dpm_sysfs_wakeup_change_owner(struct device *dev, kuid_t kuid,

						kgid_t kgid)

{

	if (dev->power.wakeup && dev->power.wakeup->dev)

		return device_change_owner(dev->power.wakeup->dev, kuid, kgid);

	return 0;

}



#else /* CONFIG_PM_SLEEP */

static inline int dpm_sysfs_wakeup_change_owner(struct device *dev, kuid_t kuid,

						kgid_t kgid)