Date: Tue, 1 Sep 2020 21:54:17 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365158 - head/sys/dev/sdhci Message-ID: <202009012154.081LsHHd047160@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mjg Date: Tue Sep 1 21:54:16 2020 New Revision: 365158 URL: https://svnweb.freebsd.org/changeset/base/365158 Log: sdhci: clean up empty lines in .c and .h files Modified: head/sys/dev/sdhci/fsl_sdhci.c head/sys/dev/sdhci/sdhci_fdt.c Modified: head/sys/dev/sdhci/fsl_sdhci.c ============================================================================== --- head/sys/dev/sdhci/fsl_sdhci.c Tue Sep 1 21:53:58 2020 (r365157) +++ head/sys/dev/sdhci/fsl_sdhci.c Tue Sep 1 21:54:16 2020 (r365158) @@ -253,7 +253,6 @@ fsl_sdhci_read_1(device_t dev, struct sdhci_slot *slot return (SDHCI_POWER_ON | SDHCI_POWER_300); } - return ((RD4(sc, off & ~3) >> (off & 3) * 8) & 0xff); } @@ -279,7 +278,6 @@ fsl_sdhci_read_2(device_t dev, struct sdhci_slot *slot return (RD4(sc, USDHC_MIX_CONTROL) & 0x37); } else if (sc->hwtype == HWTYPE_ESDHC) { - /* * The ESDHC hardware has the typical 32-bit combined "command * and mode" register that we have to cache so that command @@ -340,7 +338,7 @@ fsl_sdhci_read_4(device_t dev, struct sdhci_slot *slot val32 |= SDHCI_CAN_DO_8BITBUS; return (val32); } - + /* * The hardware moves bits around in the present state register to make * room for all 8 data line state bits. To translate, mask out all the @@ -596,7 +594,6 @@ fsl_sdhc_set_clock(struct fsl_sdhci_softc *sc, uint16_ WR4(sc, SDHCI_CLOCK_CONTROL, val32 & ~SDHC_CLK_SDCLKEN); #endif return; - } divisor = (val >> SDHCI_DIVIDER_SHIFT) & SDHCI_DIVIDER_MASK; freq = sc->baseclk_hz >> ffs(divisor); @@ -782,7 +779,6 @@ fsl_sdhci_get_platform_clock(device_t dev) /* Get sdhci node properties */ if((OF_getprop(node, "clock-frequency", (void *)&clock, sizeof(clock)) <= 0) || (clock == 0)) { - clock = mpc85xx_get_system_clock(); if (clock == 0) { @@ -799,7 +795,6 @@ fsl_sdhci_get_platform_clock(device_t dev) return (clock); } #endif - static int fsl_sdhci_detach(device_t dev) Modified: head/sys/dev/sdhci/sdhci_fdt.c ============================================================================== --- head/sys/dev/sdhci/sdhci_fdt.c Tue Sep 1 21:53:58 2020 (r365157) +++ head/sys/dev/sdhci/sdhci_fdt.c Tue Sep 1 21:54:16 2020 (r365158) @@ -317,7 +317,7 @@ sdhci_init_rk3399(device_t dev) val = SHIFTIN((freq + (1000000 / 2)) / 1000000, RK3399_CORECFG_BASECLKFREQ); SYSCON_WRITE_4(grf, RK3399_GRF_EMMCCORE_CON0, (mask << 16) | val); - + return (0); } #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009012154.081LsHHd047160>