[PATCH] mmc: omap_hsmmc: Get rid of of_have_populated_dt() usage

[Chris Ball]

Hi,

On Wed, Apr 11 2012, Rajendra Nayak wrote:
> of_have_populated_dt() is not expected to be used in drivers but
> instead only in early platform init code.
> Drivers on the other hand should rely on dev->of_node or of_match_device().
> Besides usage of of_have_populated_dt() also throws up build error as below
> which was reported by Balaji TK, when omap_hsmmc is built as a module.
>
> ERROR: "allnodes" [drivers/mmc/host/omap_hsmmc.ko] undefined!
> make[1]: *** [__modpost] Error 1
> make: *** [modules] Error 2
>
> So get rid of all of_have_populated_dt() usage in omap_hsmmc driver and
> instead use dev->of_node to make the same dicisions as earlier.
>
> Signed-off-by: Rajendra Nayak <rnayak at ti.com>
> Reported-by: Benoit Cousson <b-cousson at ti.com>
> Cc: Balaji TK <balajitk at ti.com>
> Cc: Rob Herring <rob.herring at calxeda.com>
> Cc: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
> ---
>  drivers/mmc/host/omap_hsmmc.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index ecc9521..4254b6f 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -252,7 +252,7 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on,
>  	 * the pbias cell programming support is still missing when
>  	 * booting with Device tree
>  	 */
> -	if (of_have_populated_dt() && !vdd)
> +	if (dev->of_node && !vdd)
>  		return 0;
>  
>  	if (mmc_slot(host).before_set_reg)
> @@ -1564,7 +1564,7 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>  			 * can't be allowed when booting with device
>  			 * tree.
>  			 */
> -			(!of_have_populated_dt())) {
> +			!host->dev->of_node) {
>  				/*
>  				 * The mmc_select_voltage fn of the core does
>  				 * not seem to set the power_mode to

Thanks, pushed to mmc-next for 3.4.

- Chris.
-- 
Chris Ball   <cjb at laptop.org>   <http://printf.net/>
One Laptop Per Child