aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-02-23 08:40:55 -0500
committerLiam Girdwood <lrg@ti.com>2012-03-12 09:34:23 -0400
commit58db1dcde0dcf5143dc6a54017e4a72c25fb8db0 (patch)
treec456619cc8bc003e18411d200bb1dc8b04b8cf82 /sound/soc
parente2002ab35ff7f9111081824667ce331b2c33923c (diff)
ASoC: omap: mcbsp: Remove redundant checks for the st_data pointer
The parent functions of omap_st_start/stop also checks the validity of the st_data pointer so we do not need to do it again inside of omap_st_start/stop 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 79f6da6381a..5f6c21d4b59 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -318,7 +318,7 @@ static int omap_st_start(struct omap_mcbsp *mcbsp)
318{ 318{
319 struct omap_mcbsp_st_data *st_data = mcbsp->st_data; 319 struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
320 320
321 if (st_data && st_data->enabled && !st_data->running) { 321 if (st_data->enabled && !st_data->running) {
322 omap_st_fir_write(mcbsp, st_data->taps); 322 omap_st_fir_write(mcbsp, st_data->taps);
323 omap_st_chgain(mcbsp); 323 omap_st_chgain(mcbsp);
324 324
@@ -350,7 +350,7 @@ static int omap_st_stop(struct omap_mcbsp *mcbsp)
350{ 350{
351 struct omap_mcbsp_st_data *st_data = mcbsp->st_data; 351 struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
352 352
353 if (st_data && st_data->running) { 353 if (st_data->running) {
354 if (!mcbsp->free) { 354 if (!mcbsp->free) {
355 omap_st_off(mcbsp); 355 omap_st_off(mcbsp);
356 st_data->running = 0; 356 st_data->running = 0;