Skip to contentSkip to conversation

ASoC: mxs-saif: Remove platform data

PATCH Applied Fabio Estevam 4 participants 5 messages Oct 31, 2012 – Nov 1, 2012

Subsystems (3)
Sound Arm i.MX and Layerscape ASoC

v1 of 5 Applied Latest is v5 →

lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

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

From: Fabio Estevam <[email protected]>

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 <[email protected]>
---
 sound/soc/mxs/mxs-saif.c |    8 --------
 1 file changed, 8 deletions(-)
sound/soc/mxs/mxs-saif.c +0 -8
index aa037b2..7c3154d 100644
@@ -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)) {
Signature · 1 line
1.7.9.5
author reviewer
#1 lore raw

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

From: Fabio Estevam <[email protected]>

Add MODULE_ALIAS information.

Signed-off-by Fabio Estevam <[email protected]>
---
 sound/soc/mxs/mxs-saif.c |    1 +
 1 file changed, 1 insertion(+)
sound/soc/mxs/mxs-saif.c +1 -0
index 7c3154d..fe260c1 100644
@@ -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");
Signature · 1 line
1.7.9.5
Acked-by on v1 2/2
#2 lore raw

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

Quoted 19 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Add MODULE_ALIAS information.

Signed-off-by Fabio Estevam <[email protected]>
---
 sound/soc/mxs/mxs-saif.c |    1 +
 1 file changed, 1 insertion(+)
sound/soc/mxs/mxs-saif.c +1 -1
index 7c3154d..fe260c1 100644
@@ -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");
--
Quoted 2 lines

1.7.9.5

Acked-by Dong Aisheng <[email protected]>

Regards
Dong Aisheng

#4 lore raw
In reply to Fabio Estevam
Quoted 17 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

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 <[email protected]>
---
 sound/soc/mxs/mxs-saif.c |    8 --------
 1 file changed, 8 deletions(-)
sound/soc/mxs/mxs-saif.c +0 -0
index aa037b2..7c3154d 100644

sound/soc/mxs/mxs-saif.c static int __devinit mxs_saif_probe(struct platform_device *pdev) · line 655

Quoted 4 lines
sound/soc/mxs/mxs-saif.c +0 -1
@@ -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

Quoted 20 lines
sound/soc/mxs/mxs-saif.c +0 -7
 	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)) {
Signature · 1 line
1.7.9.5