diff options
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/omap/mcbsp.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c index fe4734e0c18..79f6da6381a 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; } |