Re: [PATCH 1/5] mfd: asic3: Remove .set_pwr() callback

[Laurent Pinchart]

Hi Jingoo,

Thank you for the patch.

On Wednesday 28 August 2013 14:52:16 Jingoo Han wrote:
> Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
> platform data", .set_pwr() callback is removed from platform data.
> Thus, .set_pwr() is not used anymore. Also, this patch fixes
> the following build error and warning.
> 
> drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in
> initializer drivers/mfd/asic3.c:724:2: warning: initialization makes
> integer from pointer without a cast [enabled by default]
> drivers/mfd/asic3.c:724:2: warning: (near initialization for
> 'asic3_mmc_data.capabilities' [enabled by default]

My bad, it looks like I've overlooked a few users of the .set_pwr() field :-/ 
Sorry about that.

> Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx>
> Cc: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> Cc: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
> Cc: Ian Molton <ian.molton@xxxxxxxxxxxxxxx>
> Cc: Chris Ball <cjb@xxxxxxxxxx>
> ---
>  drivers/mfd/asic3.c |    8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
> index fa22154..7a6f713 100644
> --- a/drivers/mfd/asic3.c
> +++ b/drivers/mfd/asic3.c
> @@ -705,13 +705,6 @@ static struct mfd_cell asic3_cell_ds1wm = {
>  	.resources     = ds1wm_resources,
>  };
> 
> -static void asic3_mmc_pwr(struct platform_device *pdev, int state)
> -{
> -	struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
> -
> -	tmio_core_mmc_pwr(asic->tmio_cnf, 1 - asic->bus_shift, state);
> -}
> -

I don't think blindly removing the function is the right fix, as it seems to 
be needed. Looking at the whole series, I believe we should just revert 
3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from platform data" 
instead.

>  static void asic3_mmc_clk_div(struct platform_device *pdev, int state)
>  {
>  	struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
> @@ -721,7 +714,6 @@ static void asic3_mmc_clk_div(struct platform_device
> *pdev, int state)
> 
>  static struct tmio_mmc_data asic3_mmc_data = {
>  	.hclk           = 24576000,
> -	.set_pwr        = asic3_mmc_pwr,
>  	.set_clk_div    = asic3_mmc_clk_div,
>  };

-- 
Regards,

Laurent Pinchart

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/