[...] > /* Busy detection for the ST Micro variant */ > @@ -1455,16 +1465,13 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > ~MCI_ST_DATA2DIREN); > } > > - if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN) { > - if (host->hw_designer != AMBA_VENDOR_ST) > - pwr |= MCI_ROD; > - else { > - /* > - * The ST Micro variant use the ROD bit for something > - * else and only has OD (Open Drain). > - */ > - pwr |= MCI_OD; > - } > + if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN && > + host->variant->opendrain) { A few nitpicks (because I anyway had some comment on patch4): The above can be written on one line and the brackets isn't needed. Replace host->variant->opendrain with variant->opendrain. The same applies to the below change. > + /* > + * The ST Micro variant use the ROD bit for > + * something else and only has OD (Open Drain). > + */ I think we can remove this comment, as this information becomes implicit when we start using the variant data. > + pwr |= host->variant->opendrain; > } > > /* > -- > 1.9.1 > Kind regards Uffe -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html