The patch titled omap_hsmmc: remove 'UGLY HACK: workaround regulator framework bugs' has been added to the -mm tree. Its filename is omap_hsmmc-remove-ugly-hack-workaround-regulator-framework-bugs.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: omap_hsmmc: remove 'UGLY HACK: workaround regulator framework bugs' From: Adrian Hunter <adrian.hunter@xxxxxxxxx> The framework is fixed. The hack can be removed. Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> Cc: Madhusudhan Chikkature <madhu.cr@xxxxxx> Cc: Matt Fleming <matt@xxxxxxxxxxxxxxxxx> Cc: Tony Lindgren <tony@xxxxxxxxxxx> Cc: <linux-mmc@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mmc/host/omap_hsmmc.c | 19 ------------------- 1 file changed, 19 deletions(-) diff -puN drivers/mmc/host/omap_hsmmc.c~omap_hsmmc-remove-ugly-hack-workaround-regulator-framework-bugs drivers/mmc/host/omap_hsmmc.c --- a/drivers/mmc/host/omap_hsmmc.c~omap_hsmmc-remove-ugly-hack-workaround-regulator-framework-bugs +++ a/drivers/mmc/host/omap_hsmmc.c @@ -401,25 +401,6 @@ static int omap_hsmmc_reg_get(struct oma /* Allow an aux regulator */ reg = regulator_get(host->dev, "vmmc_aux"); host->vcc_aux = IS_ERR(reg) ? NULL : reg; - - /* - * UGLY HACK: workaround regulator framework bugs. - * When the bootloader leaves a supply active, it's - * initialized with zero usecount ... and we can't - * disable it without first enabling it. Until the - * framework is fixed, we need a workaround like this - * (which is safe for MMC, but not in general). - */ - if (regulator_is_enabled(host->vcc) > 0) { - regulator_enable(host->vcc); - regulator_disable(host->vcc); - } - if (host->vcc_aux) { - if (regulator_is_enabled(reg) > 0) { - regulator_enable(reg); - regulator_disable(reg); - } - } } return 0; _ Patches currently in -mm which might be from adrian.hunter@xxxxxxxxx are origin.patch linux-next.patch mmc-recognize-csd-structure.patch mmc-recognize-csd-structure-fix.patch mmc-split-mmc_sd_init_card.patch mmc-implement-sd-combo-iomem-support.patch mmc-omap-fix-for-bus-width-which-improves-sd-cards-peformance.patch sdio-allow-non-standard-sdio-cards.patch omap_hsmmc-add-init_card-pass-through-callback.patch omap-pandora-pass-wl1251-information-to-sdio-core.patch mmc-add-erase-secure-erase-trim-and-secure-trim-operations.patch mmc_block-add-discard-support.patch omap_hsmmc-add-erase-capability.patch block-add-secure-discard.patch mmc_block-add-support-for-secure-discard.patch mmc_test-add-performance-tests.patch mmc_test-fix-large-memory-allocation.patch mmc-use-regulator-framework-correctly.patch omap_hsmmc-remove-ugly-hack-workaround-regulator-framework-bugs.patch -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html