summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-02-23 15:38:37 +0200
committerLiam Girdwood <lrg@ti.com>2012-03-12 13:34:23 +0000
commite2002ab35ff7f9111081824667ce331b2c33923c (patch)
tree94122c364bb8849b64c37b979077594171bdd48e /sound/soc
parentb8fb4907a74dbcbd0b21e02380d58e422bd4a1fe (diff)
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/omap/mcbsp.c21
1 files changed, 5 insertions, 16 deletions
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;
}