From c53d5f58c719e2044a842aed5c9557455b01f82c Mon Sep 17 00:00:00 2001 From: bushing Date: Sun, 25 Oct 2009 03:26:48 -0700 Subject: [PATCH] sd simplification: get rid of sc_flags, because we're always running on the same hardware --- sdhc.c | 7 ++----- sdhc.h | 3 --- sdmmc.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sdhc.c b/sdhc.c index 24dd7be..f73eaf9 100644 --- a/sdhc.c +++ b/sdhc.c @@ -431,11 +431,8 @@ sdhc_bus_power(sdmmc_chipset_handle_t sch, u_int32_t ocr) struct sdhc_host *hp = sch; u_int8_t vdd; - /* - * Disable bus power before voltage change. - */ - if (!(hp->sc->sc_flags & SDHC_F_NOPWR0)) - HWRITE1(hp, SDHC_POWER_CTL, 0); + /* Disable bus power before voltage change. */ + HWRITE1(hp, SDHC_POWER_CTL, 0); /* If power is disabled, reset the host and return now. */ if (ocr == 0) { diff --git a/sdhc.h b/sdhc.h index 1c34aed..0f4520f 100644 --- a/sdhc.h +++ b/sdhc.h @@ -46,7 +46,6 @@ struct sdhc_softc { struct device sc_dev; struct sdhc_host sc_host[SDHC_MAX_HOSTS]; int sc_nhosts; - u_int sc_flags; }; @@ -62,8 +61,6 @@ void sdhc_irq(void); #ifdef CAN_HAZ_IPC void sdhc_ipc(volatile ipc_request *req); #endif -/* flag values */ -#define SDHC_F_NOPWR0 (1 << 0) /* Host standard register set */ #define SDHC_DMA_ADDR 0x00 diff --git a/sdmmc.h b/sdmmc.h index 123c6bb..b6d766d 100644 --- a/sdmmc.h +++ b/sdmmc.h @@ -205,7 +205,6 @@ struct sdmmc_softc { #define SDMMCDEVNAME(sc) ((sc)->sc_dev.dv_xname) sdmmc_chipset_tag_t sct; /* host controller chipset tag */ sdmmc_chipset_handle_t sch; /* host controller chipset handle */ - int sc_flags; #define SMF_SD_MODE 0x0001 /* host in SD mode (MMC otherwise) */ #define SMF_IO_MODE 0x0002 /* host in I/O mode (SD mode only) */ #define SMF_MEM_MODE 0x0004 /* host in memory mode (SD or MMC) */