Skip to content

Commit d13e9ad

Browse files
rafaeljwalexandrebelloni
authored andcommitted
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 <[email protected]> Reviewed-by: Zhang Rui <[email protected]> Tested-by: Zhang Rui <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/3225614.44csPzL39Z@kreacher Signed-off-by: Alexandre Belloni <[email protected]>
1 parent dca4d3b commit d13e9ad

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/rtc/rtc-cmos.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ static u32 rtc_handler(void *context)
784784
return ACPI_INTERRUPT_HANDLED;
785785
}
786786

787-
static void rtc_wake_setup(struct device *dev)
787+
static void acpi_rtc_event_setup(struct device *dev)
788788
{
789789
if (acpi_disabled)
790790
return;
@@ -828,7 +828,7 @@ static void use_acpi_alarm_quirks(void)
828828
static inline void use_acpi_alarm_quirks(void) { }
829829
#endif
830830

831-
static void cmos_wake_setup(struct device *dev)
831+
static void acpi_cmos_wake_setup(struct device *dev)
832832
{
833833
if (acpi_disabled)
834834
return;
@@ -880,11 +880,11 @@ static void cmos_check_acpi_rtc_status(struct device *dev,
880880

881881
#else /* !CONFIG_ACPI */
882882

883-
static inline void rtc_wake_setup(struct device *dev)
883+
static inline void acpi_rtc_event_setup(struct device *dev)
884884
{
885885
}
886886

887-
static inline void cmos_wake_setup(struct device *dev)
887+
static inline void acpi_cmos_wake_setup(struct device *dev)
888888
{
889889
}
890890

@@ -986,7 +986,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
986986
cmos_rtc.wake_off = info->wake_off;
987987
}
988988
} else {
989-
cmos_wake_setup(dev);
989+
acpi_cmos_wake_setup(dev);
990990
}
991991

992992
if (cmos_rtc.day_alrm >= 128)
@@ -1091,7 +1091,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
10911091
* the ACPI RTC fixed event.
10921092
*/
10931093
if (!info)
1094-
rtc_wake_setup(dev);
1094+
acpi_rtc_event_setup(dev);
10951095

10961096
dev_info(dev, "%s%s, %d bytes nvram%s\n",
10971097
!is_valid_irq(rtc_irq) ? "no alarms" :

0 commit comments

Comments
 (0)