Remove now unused disable_l2_if_needed interface.

ok kettenis@ patrick@

5 files changed, 5 insertions, 28 deletions

diff --git a/sys/arch/armv7/armv7/armv7_machdep.c b/sys/arch/armv7/armv7/armv7_machdep.c
index fc3839d74d6..52675e29cf9 100644
--- a/sys/arch/armv7/armv7/armv7_machdep.c
+++ b/sys/arch/armv7/armv7/armv7_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: armv7_machdep.c,v 1.44 2016/10/09 00:53:43 jsg Exp $ */
+/*	$OpenBSD: armv7_machdep.c,v 1.45 2016/10/25 00:04:59 jsg Exp $ */
 /*	$NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
 
 /*
@@ -464,7 +464,6 @@ initarm(void *arg0, void *arg1, void *arg2, paddr_t loadaddr)
 	physical_end = MIN(reg.addr + reg.size, (paddr_t)-PAGE_SIZE);
 
 	platform_init();
-	platform_disable_l2_if_needed();
 
 	/* setup a serial console for very early boot */
 	consinit();
diff --git a/sys/arch/armv7/armv7/armv7_machdep.h b/sys/arch/armv7/armv7/armv7_machdep.h
index e9492bbea8d..ff52b0c2744 100644
--- a/sys/arch/armv7/armv7/armv7_machdep.h
+++ b/sys/arch/armv7/armv7/armv7_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: armv7_machdep.h,v 1.11 2016/10/09 00:53:43 jsg Exp $	*/
+/*	$OpenBSD: armv7_machdep.h,v 1.12 2016/10/25 00:04:59 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
  *
@@ -25,7 +25,6 @@ void platform_powerdown(void);
 void platform_watchdog_reset(void);
 void platform_init_cons(void);
 void platform_init_mainbus(struct device *);
-void platform_disable_l2_if_needed(void);
 struct board_dev *platform_board_devs();
 void *fdt_find_cons(const char *);
 extern void (*cpuresetfn)(void);
@@ -39,7 +38,6 @@ struct armv7_platform {
 	void (*init_cons)(void);
 	void (*watchdog_reset)(void);
 	void (*powerdown)(void);
-	void (*disable_l2_if_needed)(void);
 	void (*init_mainbus)(struct device *);
 };
 
diff --git a/sys/arch/armv7/armv7/platform.c b/sys/arch/armv7/armv7/platform.c
index 3160cb5a51f..028feac7710 100644
--- a/sys/arch/armv7/armv7/platform.c
+++ b/sys/arch/armv7/armv7/platform.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: platform.c,v 1.19 2016/10/23 18:50:34 kettenis Exp $	*/
+/*	$OpenBSD: platform.c,v 1.20 2016/10/25 00:04:59 jsg Exp $	*/
 /*
  * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
  *
@@ -122,13 +122,6 @@ platform_powerdown(void)
 		platform->powerdown();
 }
 
-void
-platform_disable_l2_if_needed(void)
-{
-	if (platform && platform->disable_l2_if_needed)
-		platform->disable_l2_if_needed();
-}
-
 struct board_dev *
 platform_board_devs()
 {
diff --git a/sys/arch/armv7/exynos/exynos_machdep.c b/sys/arch/armv7/exynos/exynos_machdep.c
index b799dce2477..f3dc334ff9f 100644
--- a/sys/arch/armv7/exynos/exynos_machdep.c
+++ b/sys/arch/armv7/exynos/exynos_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exynos_machdep.c,v 1.9 2016/06/08 15:27:05 jsg Exp $	*/
+/*	$OpenBSD: exynos_machdep.c,v 1.10 2016/10/25 00:04:59 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -60,12 +60,6 @@ exynos_platform_powerdown(void)
 
 }
 
-static void
-exynos_platform_disable_l2_if_needed(void)
-{
-
-}
-
 void
 exynos_platform_board_init(void)
 {
@@ -77,7 +71,6 @@ struct armv7_platform exynos_platform = {
 	.smc_write = exynos_platform_smc_write,
 	.watchdog_reset = exynos_platform_watchdog_reset,
 	.powerdown = exynos_platform_powerdown,
-	.disable_l2_if_needed = exynos_platform_disable_l2_if_needed,
 	.init_mainbus = exynos_platform_init_mainbus,
 };
 
diff --git a/sys/arch/armv7/omap/omap_machdep.c b/sys/arch/armv7/omap/omap_machdep.c
index dc2c637a6f3..12302c08e96 100644
--- a/sys/arch/armv7/omap/omap_machdep.c
+++ b/sys/arch/armv7/omap/omap_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: omap_machdep.c,v 1.10 2016/10/23 05:07:29 jsg Exp $	*/
+/*	$OpenBSD: omap_machdep.c,v 1.11 2016/10/25 00:04:59 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
  *
@@ -73,11 +73,6 @@ omap_platform_powerdown(void)
 }
 
 void
-omap_platform_disable_l2_if_needed(void)
-{
-}
-
-void
 omap_platform_board_init(void)
 {
 	omap_board_init();
@@ -88,7 +83,6 @@ struct armv7_platform omap_platform = {
 	.smc_write = omap_platform_smc_write,
 	.watchdog_reset = omap_platform_watchdog_reset,
 	.powerdown = omap_platform_powerdown,
-	.disable_l2_if_needed = omap_platform_disable_l2_if_needed,
 	.init_mainbus = omap_platform_init_mainbus,
 };