mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-16 18:08:20 +00:00
rtc: cmos: Rename ACPI-related functions
The names of rtc_wake_setup() and cmos_wake_setup() don't indicate that these functions are ACPI-related, which is the case, and the former doesn't really reflect the role of the function. Rename them to acpi_rtc_event_setup() and acpi_cmos_wake_setup(), respectively, to address this shortcoming. No intentional functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Zhang Rui <rui.zhang@intel.com> Tested-by: Zhang Rui <rui.zhang@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/3225614.44csPzL39Z@kreacher Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
parent
dca4d3b71c
commit
d13e9ad9f5
@ -784,7 +784,7 @@ static u32 rtc_handler(void *context)
|
||||
return ACPI_INTERRUPT_HANDLED;
|
||||
}
|
||||
|
||||
static void rtc_wake_setup(struct device *dev)
|
||||
static void acpi_rtc_event_setup(struct device *dev)
|
||||
{
|
||||
if (acpi_disabled)
|
||||
return;
|
||||
@ -828,7 +828,7 @@ static void use_acpi_alarm_quirks(void)
|
||||
static inline void use_acpi_alarm_quirks(void) { }
|
||||
#endif
|
||||
|
||||
static void cmos_wake_setup(struct device *dev)
|
||||
static void acpi_cmos_wake_setup(struct device *dev)
|
||||
{
|
||||
if (acpi_disabled)
|
||||
return;
|
||||
@ -880,11 +880,11 @@ static void cmos_check_acpi_rtc_status(struct device *dev,
|
||||
|
||||
#else /* !CONFIG_ACPI */
|
||||
|
||||
static inline void rtc_wake_setup(struct device *dev)
|
||||
static inline void acpi_rtc_event_setup(struct device *dev)
|
||||
{
|
||||
}
|
||||
|
||||
static inline void cmos_wake_setup(struct device *dev)
|
||||
static inline void acpi_cmos_wake_setup(struct device *dev)
|
||||
{
|
||||
}
|
||||
|
||||
@ -986,7 +986,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
|
||||
cmos_rtc.wake_off = info->wake_off;
|
||||
}
|
||||
} else {
|
||||
cmos_wake_setup(dev);
|
||||
acpi_cmos_wake_setup(dev);
|
||||
}
|
||||
|
||||
if (cmos_rtc.day_alrm >= 128)
|
||||
@ -1091,7 +1091,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
|
||||
* the ACPI RTC fixed event.
|
||||
*/
|
||||
if (!info)
|
||||
rtc_wake_setup(dev);
|
||||
acpi_rtc_event_setup(dev);
|
||||
|
||||
dev_info(dev, "%s%s, %d bytes nvram%s\n",
|
||||
!is_valid_irq(rtc_irq) ? "no alarms" :
|
||||
|
Loading…
x
Reference in New Issue
Block a user