All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 1/1] ASoC: mxs-saif: remove function in platform_data
@ 2011-11-22 15:52 ` Dong Aisheng
  0 siblings, 0 replies; 4+ messages in thread
From: Dong Aisheng @ 2011-11-22 15:52 UTC (permalink / raw)
  To: alsa-devel
  Cc: s.hauer, broonie, w.sang, shawn.guo, kernel, u.kleine-koenig,
	lrg, linux-arm-kernel

Add master_mode and master_id in platfrom_data since it's board
specific and board knows it.
Then we can remove the function pointer in platfrom_data to make
the driver more devicetree friendly.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

---
Changes v1->v2:
 Missed a parenthesis as follows, add it and resend.
 Sorry for inconvenience.

 Changes based on v1:
-                       saif->master_id == saif->id)
+                       saif->master_id == saif->id) {
                        dev_err(&pdev->dev, "get wrong master id\n");
                        return -EINVAL;
+               }
---
 include/sound/saif.h     |    4 ++--
 sound/soc/mxs/mxs-saif.c |   20 +++++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/sound/saif.h b/include/sound/saif.h
index d0e0de7..f22f3e1 100644
--- a/include/sound/saif.h
+++ b/include/sound/saif.h
@@ -10,7 +10,7 @@
 #define __SOUND_SAIF_H__
 
 struct mxs_saif_platform_data {
-	int (*init) (void);
-	int (*get_master_id) (unsigned int saif_id);
+	bool master_mode;	/* if true use master mode */
+	int master_id;		/* id of the master if in slave mode */
 };
 #endif
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 76dc74d..1ef697f 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -625,13 +625,6 @@ static int mxs_saif_probe(struct platform_device *pdev)
 	if (pdev->id >= ARRAY_SIZE(mxs_saif))
 		return -EINVAL;
 
-	pdata = pdev->dev.platform_data;
-	if (pdata && pdata->init) {
-		ret = pdata->init();
-		if (ret)
-			return ret;
-	}
-
 	saif = kzalloc(sizeof(*saif), GFP_KERNEL);
 	if (!saif)
 		return -ENOMEM;
@@ -639,12 +632,17 @@ static int mxs_saif_probe(struct platform_device *pdev)
 	mxs_saif[pdev->id] = saif;
 	saif->id = pdev->id;
 
-	saif->master_id = saif->id;
-	if (pdata && pdata->get_master_id) {
-		saif->master_id = pdata->get_master_id(saif->id);
+	pdata = pdev->dev.platform_data;
+	if (pdata && !pdata->master_mode) {
+		saif->master_id = pdata->master_id;
 		if (saif->master_id < 0 ||
-			saif->master_id >= ARRAY_SIZE(mxs_saif))
+			saif->master_id >= ARRAY_SIZE(mxs_saif) ||
+			saif->master_id == saif->id) {
+			dev_err(&pdev->dev, "get wrong master id\n");
 			return -EINVAL;
+		}
+	} else {
+		saif->master_id = saif->id;
 	}
 
 	saif->clk = clk_get(&pdev->dev, NULL);
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH v2 1/1] ASoC: mxs-saif: remove function in platform_data
@ 2011-11-22 15:52 ` Dong Aisheng
  0 siblings, 0 replies; 4+ messages in thread
From: Dong Aisheng @ 2011-11-22 15:52 UTC (permalink / raw)
  To: linux-arm-kernel

Add master_mode and master_id in platfrom_data since it's board
specific and board knows it.
Then we can remove the function pointer in platfrom_data to make
the driver more devicetree friendly.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

---
Changes v1->v2:
 Missed a parenthesis as follows, add it and resend.
 Sorry for inconvenience.

 Changes based on v1:
-                       saif->master_id == saif->id)
+                       saif->master_id == saif->id) {
                        dev_err(&pdev->dev, "get wrong master id\n");
                        return -EINVAL;
+               }
---
 include/sound/saif.h     |    4 ++--
 sound/soc/mxs/mxs-saif.c |   20 +++++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/sound/saif.h b/include/sound/saif.h
index d0e0de7..f22f3e1 100644
--- a/include/sound/saif.h
+++ b/include/sound/saif.h
@@ -10,7 +10,7 @@
 #define __SOUND_SAIF_H__
 
 struct mxs_saif_platform_data {
-	int (*init) (void);
-	int (*get_master_id) (unsigned int saif_id);
+	bool master_mode;	/* if true use master mode */
+	int master_id;		/* id of the master if in slave mode */
 };
 #endif
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 76dc74d..1ef697f 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -625,13 +625,6 @@ static int mxs_saif_probe(struct platform_device *pdev)
 	if (pdev->id >= ARRAY_SIZE(mxs_saif))
 		return -EINVAL;
 
-	pdata = pdev->dev.platform_data;
-	if (pdata && pdata->init) {
-		ret = pdata->init();
-		if (ret)
-			return ret;
-	}
-
 	saif = kzalloc(sizeof(*saif), GFP_KERNEL);
 	if (!saif)
 		return -ENOMEM;
@@ -639,12 +632,17 @@ static int mxs_saif_probe(struct platform_device *pdev)
 	mxs_saif[pdev->id] = saif;
 	saif->id = pdev->id;
 
-	saif->master_id = saif->id;
-	if (pdata && pdata->get_master_id) {
-		saif->master_id = pdata->get_master_id(saif->id);
+	pdata = pdev->dev.platform_data;
+	if (pdata && !pdata->master_mode) {
+		saif->master_id = pdata->master_id;
 		if (saif->master_id < 0 ||
-			saif->master_id >= ARRAY_SIZE(mxs_saif))
+			saif->master_id >= ARRAY_SIZE(mxs_saif) ||
+			saif->master_id == saif->id) {
+			dev_err(&pdev->dev, "get wrong master id\n");
 			return -EINVAL;
+		}
+	} else {
+		saif->master_id = saif->id;
 	}
 
 	saif->clk = clk_get(&pdev->dev, NULL);
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] ASoC: mxs-saif: remove function in platform_data
  2011-11-22 15:52 ` Dong Aisheng
@ 2011-11-24  7:31   ` Shawn Guo
  -1 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2011-11-24  7:31 UTC (permalink / raw)
  To: Dong Aisheng
  Cc: alsa-devel, s.hauer, broonie, w.sang, kernel, u.kleine-koenig,
	lrg, linux-arm-kernel

On Tue, Nov 22, 2011 at 11:52:21PM +0800, Dong Aisheng wrote:
> Add master_mode and master_id in platfrom_data since it's board
> specific and board knows it.
> Then we can remove the function pointer in platfrom_data to make
> the driver more devicetree friendly.
> 
> Signed-off-by: Dong Aisheng <b29396@freescale.com>
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> 
Applied, thanks.

-- 
Regards,
Shawn

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH v2 1/1] ASoC: mxs-saif: remove function in platform_data
@ 2011-11-24  7:31   ` Shawn Guo
  0 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2011-11-24  7:31 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Nov 22, 2011 at 11:52:21PM +0800, Dong Aisheng wrote:
> Add master_mode and master_id in platfrom_data since it's board
> specific and board knows it.
> Then we can remove the function pointer in platfrom_data to make
> the driver more devicetree friendly.
> 
> Signed-off-by: Dong Aisheng <b29396@freescale.com>
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> 
Applied, thanks.

-- 
Regards,
Shawn

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-24  7:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-22 15:52 [PATCH v2 1/1] ASoC: mxs-saif: remove function in platform_data Dong Aisheng
2011-11-22 15:52 ` Dong Aisheng
2011-11-24  7:31 ` Shawn Guo
2011-11-24  7:31   ` Shawn Guo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.