Skip to content

Commit

Permalink
ASoC: omap: mcbsp: Use uniform st_data pointer initialization
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Ujfalusi authored and Liam Girdwood committed Mar 12, 2012
1 parent b8fb490 commit e2002ab
Showing 1 changed file with 5 additions and 16 deletions.
21 changes: 5 additions & 16 deletions sound/soc/omap/mcbsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand All @@ -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;
}

Expand Down

0 comments on commit e2002ab

Please sign in to comment.