[PATCH] mmci: drop superfluous regulator #ifdef

Russell King - ARM Linux linux at arm.linux.org.uk
Sun Dec 19 11:00:59 EST 2010


On Thu, Dec 02, 2010 at 02:36:58PM +0100, Linus Walleij wrote:
> The regulator and MMC frameworks provide the proper stub functions
> for the regulator functions anyway, get rid of this.

I'm dropping this patch - it's wrong, because on platforms without
regulator support, it stamps over the provided platform values:

mmci-pl18x mb:mmci: Provided ocr_mask/setpower will not be used (using regulator instead)

# CONFIG_REGULATOR is not set

So the ifdefs have to stay until some other solution for this is found.
Maybe the:

        if (IS_ERR(host->vcc))
                host->vcc = NULL;
        else {

should be:

        if (IS_ERR(host->vcc) || host->vcc == NULL)
                host->vcc = NULL;
        else {

or maybe:

        if (IS_ERR(host->vcc))
                host->vcc = NULL;
        else if (host->vcc) {



More information about the linux-arm-kernel mailing list