aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2018-11-08 09:29:59 +0200
committerMark Brown <broonie@kernel.org>2018-11-13 09:50:28 -0800
commit465d85b3976a15c9e0e205ff50be64efa11b7af3 (patch)
tree865074a5370c52363d6ab8ff818a3553d4b3f5ed
parentASoC: omap-mcbsp: Re-arrange files for core McBSP and Sidetone function split (diff)
downloadlinux-dev-465d85b3976a15c9e0e205ff50be64efa11b7af3.tar.xz
linux-dev-465d85b3976a15c9e0e205ff50be64efa11b7af3.zip
ASoC: omap-mcbsp: Remove redundant check for mcbsp->pdata
The driver will not probe if the pdata is not provided or created. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/omap/omap-mcbsp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index e48fad11a0cc..8cab1151d3bb 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -324,7 +324,7 @@ static int omap_mcbsp_request(struct omap_mcbsp *mcbsp)
mcbsp->reg_cache = reg_cache;
spin_unlock(&mcbsp->lock);
- if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request)
+ if(mcbsp->pdata->ops && mcbsp->pdata->ops->request)
mcbsp->pdata->ops->request(mcbsp->id - 1);
/*
@@ -361,7 +361,7 @@ static int omap_mcbsp_request(struct omap_mcbsp *mcbsp)
err_free_irq:
free_irq(mcbsp->tx_irq, (void *)mcbsp);
err_clk_disable:
- if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free)
+ if(mcbsp->pdata->ops && mcbsp->pdata->ops->free)
mcbsp->pdata->ops->free(mcbsp->id - 1);
/* Disable wakeup behavior */
@@ -382,7 +382,7 @@ static void omap_mcbsp_free(struct omap_mcbsp *mcbsp)
{
void *reg_cache;
- if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free)
+ if(mcbsp->pdata->ops && mcbsp->pdata->ops->free)
mcbsp->pdata->ops->free(mcbsp->id - 1);
/* Disable wakeup behavior */