Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Sep 2017 04:07:39 +0000 (21:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Sep 2017 04:07:39 +0000 (21:07 -0700)
Pull m68knommu updates from Greg Ungerer:
 "Only two changes. One removes unused code, the other makes local clock
  code arguments consistent with generic clock code"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: remove dead code
  m68k: allow NULL clock for clk_get_rate

arch/m68k/coldfire/clk.c
arch/m68k/coldfire/m5441x.c

index 1e3c7e9193d14d0a3c0c6821c1f686d6ef35d02d..856069a3196d224d7ee39a980289dcc738b691b8 100644 (file)
@@ -121,6 +121,9 @@ EXPORT_SYMBOL(clk_put);
 
 unsigned long clk_get_rate(struct clk *clk)
 {
+       if (!clk)
+               return 0;
+
        return clk->rate;
 }
 EXPORT_SYMBOL(clk_get_rate);
index dc589b039b625e3a6845c2caca07740412f781ae..04fd7fde9fb399e2b7c1c32f60e61f35e2d71d27 100644 (file)
@@ -222,40 +222,3 @@ void __init config_BSP(char *commandp, int size)
        m5441x_uarts_init();
        m5441x_fec_init();
 }
-
-
-#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
-static struct resource m5441x_rtc_resources[] = {
-       {
-               .start          = MCFRTC_BASE,
-               .end            = MCFRTC_BASE + MCFRTC_SIZE - 1,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = MCF_IRQ_RTC,
-               .end            = MCF_IRQ_RTC,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device m5441x_rtc = {
-       .name                   = "mcfrtc",
-       .id                     = 0,
-       .resource               = m5441x_rtc_resources,
-       .num_resources          = ARRAY_SIZE(m5441x_rtc_resources),
-};
-#endif
-
-static struct platform_device *m5441x_devices[] __initdata = {
-#if IS_ENABLED(CONFIG_RTC_DRV_M5441x)
-       &m5441x_rtc,
-#endif
-};
-
-static int __init init_BSP(void)
-{
-       platform_add_devices(m5441x_devices, ARRAY_SIZE(m5441x_devices));
-       return 0;
-}
-
-arch_initcall(init_BSP);