svn commit: r348885 - in head/sys: arm/allwinner arm/broadcom/bcm2835 arm64/rockchip

[Bjoern A. Zeeb]

Author: bz
Date: Mon Jun 10 23:25:40 2019
New Revision: 348885
URL: https://svnweb.freebsd.org/changeset/base/348885

Log:
  A bit of code hygiene (no functional changes).
  
  Hide unused code under #ifdef notyet (in one case the only caller is under
  that same ifdef), or if it is arm (not arm64) specific code under the
  __arm__ ifdef to not yield -Wunused-function warnings during the arm64
  kernel compile.
  
  MFC after:	2 weeks

Modified:
  head/sys/arm/allwinner/a10_timer.c
  head/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c
  head/sys/arm64/rockchip/if_dwc_rk.c

Modified: head/sys/arm/allwinner/a10_timer.c
==============================================================================
--- head/sys/arm/allwinner/a10_timer.c	Mon Jun 10 22:23:37 2019	(r348884)
+++ head/sys/arm/allwinner/a10_timer.c	Mon Jun 10 23:25:40 2019	(r348885)
@@ -108,12 +108,16 @@ struct a10_timer_softc {
 	bus_write_4(sc->res[A10_TIMER_MEMRES], reg, val)
 
 static u_int	a10_timer_get_timecount(struct timecounter *);
+#if defined(__arm__)
 static int	a10_timer_timer_start(struct eventtimer *,
     sbintime_t first, sbintime_t period);
 static int	a10_timer_timer_stop(struct eventtimer *);
+#endif
 
 static uint64_t timer_read_counter64(struct a10_timer_softc *sc);
+#if defined(__arm__)
 static void a10_timer_eventtimer_setup(struct a10_timer_softc *sc);
+#endif
 
 static void a23_timer_timecounter_setup(struct a10_timer_softc *sc);
 static u_int a23_timer_get_timecount(struct timecounter *tc);
@@ -279,6 +283,7 @@ a10_timer_irq(void *arg)
  * Event timer function for A10 and A13
  */
 
+#if defined(__arm__)
 static void
 a10_timer_eventtimer_setup(struct a10_timer_softc *sc)
 {
@@ -363,6 +368,7 @@ a10_timer_timer_stop(struct eventtimer *et)
 
 	return (0);
 }
+#endif
 
 /*
  * Timecounter functions for A23 and above

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c	Mon Jun 10 22:23:37 2019	(r348884)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c	Mon Jun 10 23:25:40 2019	(r348885)
@@ -251,6 +251,7 @@ WR4(struct bcm_sdhost_softc *sc, bus_size_t off, uint3
 	bus_space_write_4(sc->sc_bst, sc->sc_bsh, off, val);
 }
 
+#ifdef notyet
 static inline uint16_t
 RD2(struct bcm_sdhost_softc *sc, bus_size_t off)
 {
@@ -260,6 +261,7 @@ RD2(struct bcm_sdhost_softc *sc, bus_size_t off)
 
 	return ((val >> (off & 3)*8) & 0xffff);
 }
+#endif
 
 static inline uint8_t
 RD1(struct bcm_sdhost_softc *sc, bus_size_t off)

Modified: head/sys/arm64/rockchip/if_dwc_rk.c
==============================================================================
--- head/sys/arm64/rockchip/if_dwc_rk.c	Mon Jun 10 22:23:37 2019	(r348884)
+++ head/sys/arm64/rockchip/if_dwc_rk.c	Mon Jun 10 23:25:40 2019	(r348885)
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #define	RK3328_GRF_MACPHY_CON3		0x0B0C
 #define	RK3328_GRF_MACPHY_STATUS	0x0B10
 
+#ifdef notyet
 static void
 rk3328_set_delays(struct syscon *grf, phandle_t node)
 {
@@ -82,6 +83,7 @@ rk3328_set_delays(struct syscon *grf, phandle_t node)
 
 	SYSCON_WRITE_4(grf, RK3328_GRF_MAC_CON0, tx | rx | 0xFFFF0000);
 }
+#endif
 
 #define	RK3399_GRF_SOC_CON6		0xc218
 #define	 RK3399_GRF_SOC_CON6_TX_MASK	0x7F
@@ -89,6 +91,7 @@ rk3328_set_delays(struct syscon *grf, phandle_t node)
 #define	 RK3399_GRF_SOC_CON6_RX_MASK	0x7F
 #define	 RK3399_GRF_SOC_CON6_RX_SHIFT	8
 
+#ifdef notyet
 static void
 rk3399_set_delays(struct syscon *grf, phandle_t node)
 {
@@ -106,6 +109,7 @@ rk3399_set_delays(struct syscon *grf, phandle_t node)
 
 	SYSCON_WRITE_4(grf, RK3399_GRF_SOC_CON6, tx | rx | 0xFFFF0000);
 }
+#endif
 
 static int
 if_dwc_rk_probe(device_t dev)