diff options
| -rw-r--r-- | drivers/mci/mci-core.c | 6 | ||||
| -rw-r--r-- | include/mci.h | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index f647cae820..2abed00117 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -864,7 +864,7 @@ static void mci_set_clock(struct mci *mci, unsigned clock) * @param mci MCI instance * @param width New interface bit width (1, 4 or 8) */ -static void mci_set_bus_width(struct mci *mci, unsigned width) +static void mci_set_bus_width(struct mci *mci, enum mci_bus_width width) { struct mci_host *host = mci->host; @@ -1055,7 +1055,7 @@ static void mci_extract_card_dsr_imp_from_csd(struct mci *mci) mci->dsr_imp = UNSTUFF_BITS(mci->csd, 76, 1); } -static int mmc_compare_ext_csds(struct mci *mci, unsigned bus_width) +static int mmc_compare_ext_csds(struct mci *mci, enum mci_bus_width bus_width) { u8 *bw_ext_csd; int err; @@ -1176,7 +1176,7 @@ static int mci_startup_mmc(struct mci *mci) EXT_CSD_BUS_WIDTH_4, EXT_CSD_BUS_WIDTH_8, }; - static unsigned bus_widths[] = { + static enum mci_bus_width bus_widths[] = { MMC_BUS_WIDTH_4, MMC_BUS_WIDTH_8, }; diff --git a/include/mci.h b/include/mci.h index c385673032..a3f6d619b3 100644 --- a/include/mci.h +++ b/include/mci.h @@ -410,16 +410,16 @@ enum mci_timing { MMC_TIMING_MMC_HS400 = 8, }; -struct mci_ios { - unsigned int clock; /* clock rate */ - - unsigned char bus_width; /* data bus width */ - -#define MMC_BUS_WIDTH_1 0 -#define MMC_BUS_WIDTH_4 2 -#define MMC_BUS_WIDTH_8 3 +enum mci_bus_width { + MMC_BUS_WIDTH_1 = 0, + MMC_BUS_WIDTH_4 = 2, + MMC_BUS_WIDTH_8 = 3, +}; - enum mci_timing timing; /* timing specification used */ +struct mci_ios { + unsigned int clock; /* clock rate */ + enum mci_bus_width bus_width; /* data bus width */ + enum mci_timing timing; /* timing specification used */ }; struct mci; @@ -434,7 +434,7 @@ struct mci_host { unsigned f_min; /**< host interface lower limit */ unsigned f_max; /**< host interface upper limit */ unsigned clock; /**< Current clock used to talk to the card */ - unsigned bus_width; /**< used data bus width to the card */ + enum mci_bus_width bus_width; /**< used data bus width to the card */ enum mci_timing timing; /**< used timing specification to the card */ unsigned max_req_size; unsigned dsr_val; /**< optional dsr value */ |