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

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

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@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@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;
 	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

[PATCH 2/2] ASoC: mxs-saif: Add MODULE_ALIAS

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

Add MODULE_ALIAS information.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 sound/soc/mxs/mxs-saif.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 7c3154d..fe260c1 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -804,3 +804,4 @@ module_platform_driver(mxs_saif_driver);
 MODULE_AUTHOR("Freescale Semiconductor, Inc.");
 MODULE_DESCRIPTION("MXS ASoC SAIF driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxs-saif");
-- 
1.7.9.5

Re: [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@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@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
> 

Re: [PATCH 2/2] ASoC: mxs-saif: Add MODULE_ALIAS

[Dong Aisheng]

On 31 October 2012 11:20, Fabio Estevam <festevam@gmail.com> wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Add MODULE_ALIAS information.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  sound/soc/mxs/mxs-saif.c |    1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
> index 7c3154d..fe260c1 100644
> --- a/sound/soc/mxs/mxs-saif.c
> +++ b/sound/soc/mxs/mxs-saif.c
> @@ -804,3 +804,4 @@ module_platform_driver(mxs_saif_driver);
>  MODULE_AUTHOR("Freescale Semiconductor, Inc.");
>  MODULE_DESCRIPTION("MXS ASoC SAIF driver");
>  MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:mxs-saif");
> --
> 1.7.9.5
>

Acked-by: Dong Aisheng <dong.aisheng@linaro.org>

Regards
Dong Aisheng

Re: [PATCH 2/2] ASoC: mxs-saif: Add MODULE_ALIAS

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 174 bytes --]

On Wed, Oct 31, 2012 at 01:20:05AM -0200, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Add MODULE_ALIAS information.

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]