[alsa-devel] [PATCH 1/2] ASoC: mxs-saif: Remove platform data

[Shawn Guo]

On Wed, Oct 31, 2012 at 01:20:04AM -0200, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam at freescale.com>
> 
> All MXS users have been converted to device tree and the board files have been
> removed.
> 
> No need to keep platform data in the driver.
>   
> Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
> ---
>  sound/soc/mxs/mxs-saif.c |    8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
> index aa037b2..7c3154d 100644
> --- a/sound/soc/mxs/mxs-saif.c
> +++ b/sound/soc/mxs/mxs-saif.c
> @@ -652,7 +652,6 @@ static int __devinit mxs_saif_probe(struct platform_device *pdev)
>  	struct device_node *np = pdev->dev.of_node;
>  	struct resource *iores, *dmares;
>  	struct mxs_saif *saif;
> -	struct mxs_saif_platform_data *pdata;

Remove the definition of "struct mxs_saif_platform_data" altogether?

Shawn

>  	struct pinctrl *pinctrl;
>  	int ret = 0;
>  
> @@ -682,13 +681,6 @@ static int __devinit mxs_saif_probe(struct platform_device *pdev)
>  			if (saif->master_id < 0)
>  				return saif->master_id;
>  		}
> -	} else {
> -		saif->id = pdev->id;
> -		pdata = pdev->dev.platform_data;
> -		if (pdata && !pdata->master_mode)
> -			saif->master_id = pdata->master_id;
> -		else
> -			saif->master_id = saif->id;
>  	}
>  
>  	if (saif->master_id < 0 || saif->master_id >= ARRAY_SIZE(mxs_saif)) {
> -- 
> 1.7.9.5
>