From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Thu, 23 Feb 2012 13:38:37 +0000 (+0200)
Subject: ASoC: omap: mcbsp: Use uniform st_data pointer initialization
X-Git-Tag: v3.4-rc1~144^2~2^2~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e2002ab35ff7f9111081824667ce331b2c33923c;p=karo-tx-linux.git

ASoC: omap: mcbsp: Use uniform st_data pointer initialization

In this way we can save few lines, and have uniform way of initializing the
st_data in all functions.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
---

diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index fe4734e0c18c..79f6da6381af 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -273,11 +273,9 @@ static void omap_st_chgain(struct omap_mcbsp *mcbsp)
 
 int omap_st_set_chgain(struct omap_mcbsp *mcbsp, int channel, s16 chgain)
 {
-	struct omap_mcbsp_st_data *st_data;
+	struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
 	int ret = 0;
 
-	st_data = mcbsp->st_data;
-
 	if (!st_data)
 		return -ENOENT;
 
@@ -298,11 +296,9 @@ int omap_st_set_chgain(struct omap_mcbsp *mcbsp, int channel, s16 chgain)
 
 int omap_st_get_chgain(struct omap_mcbsp *mcbsp, int channel, s16 *chgain)
 {
-	struct omap_mcbsp_st_data *st_data;
+	struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
 	int ret = 0;
 
-	st_data = mcbsp->st_data;
-
 	if (!st_data)
 		return -ENOENT;
 
@@ -337,9 +333,7 @@ static int omap_st_start(struct omap_mcbsp *mcbsp)
 
 int omap_st_enable(struct omap_mcbsp *mcbsp)
 {
-	struct omap_mcbsp_st_data *st_data;
-
-	st_data = mcbsp->st_data;
+	struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
 
 	if (!st_data)
 		return -ENODEV;
@@ -368,11 +362,9 @@ static int omap_st_stop(struct omap_mcbsp *mcbsp)
 
 int omap_st_disable(struct omap_mcbsp *mcbsp)
 {
-	struct omap_mcbsp_st_data *st_data;
+	struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
 	int ret = 0;
 
-	st_data = mcbsp->st_data;
-
 	if (!st_data)
 		return -ENODEV;
 
@@ -386,14 +378,11 @@ int omap_st_disable(struct omap_mcbsp *mcbsp)
 
 int omap_st_is_enabled(struct omap_mcbsp *mcbsp)
 {
-	struct omap_mcbsp_st_data *st_data;
-
-	st_data = mcbsp->st_data;
+	struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
 
 	if (!st_data)
 		return -ENODEV;
 
-
 	return st_data->enabled;
 }