Merge tag 'v4.0-rc2' into irq/core, to refresh the tree before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index ca9622a25e95..cd9685235df9 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -49,11 +49,11 @@ int mach_set_rtc_mmss(const struct timespec *now)
                 retval = set_rtc_time(&tm);
                 if (retval)
                         printk(KERN_ERR "%s: RTC write failed with error %d\n",
-                               __FUNCTION__, retval);
+                               __func__, retval);
         } else {
                 printk(KERN_ERR
                        "%s: Invalid RTC value: write of %lx to RTC failed\n",
-                        __FUNCTION__, nowtime);
+                        __func__, nowtime);
                 retval = -EINVAL;
         }
         return retval;
@@ -170,7 +170,7 @@ static struct platform_device rtc_device = {
 static __init int add_rtc_cmos(void)
 {
 #ifdef CONFIG_PNP
-        static const char * const  const ids[] __initconst =
+        static const char * const ids[] __initconst =
             { "PNP0b00", "PNP0b01", "PNP0b02", };
         struct pnp_dev *dev;
         struct pnp_id *id;