aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-02-11 13:42:55 +0100
committerLinus Walleij <linus.walleij@linaro.org>2018-02-20 14:42:56 +0100
commit23e239c19c42d3e76bc9e8e5bae15af9bf0905c4 (patch)
tree721f8ff41632fb9d71f77263b3f6341ea1b98002
parent36b7494dfccf9b1d7ccafb46be4b773d38d8101b (diff)
downloadlinux-stericsson-23e239c19c42d3e76bc9e8e5bae15af9bf0905c4.tar.gz
ASoC: ux500: get rid of all use of the MSP ID
The MSP ID number is passed from platform data and irrelevant as we move toward device tree boots. It is only used for debug messages, so let's refer to the memory base instead. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--sound/soc/ux500/ux500_msp_dai.c8
-rw-r--r--sound/soc/ux500/ux500_msp_i2s.h1
2 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index b3dd523eaa13..d9319fc33845 100644
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -649,9 +649,9 @@ static int ux500_msp_dai_trigger(struct snd_pcm_substream *substream,
int ret = 0;
struct ux500_msp_i2s_drvdata *drvdata = dev_get_drvdata(dai->dev);
- dev_dbg(dai->dev, "%s: MSP %d (%s): Enter (msp->id = %d, cmd = %d).\n",
+ dev_dbg(dai->dev, "%s: MSP %d (%s): Enter (msp base = %p, cmd = %d).\n",
__func__, dai->id, snd_pcm_stream_str(substream),
- (int)drvdata->msp->id, cmd);
+ drvdata->msp->registers, cmd);
ret = ux500_msp_i2s_trigger(drvdata->msp, cmd, substream->stream);
@@ -778,8 +778,8 @@ static int ux500_msp_drv_probe(struct platform_device *pdev)
ret = snd_soc_register_component(&pdev->dev, &ux500_msp_component,
&ux500_msp_dai_drv, 1);
if (ret < 0) {
- dev_err(&pdev->dev, "Error: %s: Failed to register MSP%d!\n",
- __func__, drvdata->msp->id);
+ dev_err(&pdev->dev, "Error: %s: Failed to register MSP @ %p!\n",
+ __func__, drvdata->msp->registers);
return ret;
}
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h
index 45b287b9f32e..5cd400d209d7 100644
--- a/sound/soc/ux500/ux500_msp_i2s.h
+++ b/sound/soc/ux500/ux500_msp_i2s.h
@@ -475,7 +475,6 @@ struct ux500_msp_dma_params {
};
struct ux500_msp {
- int id;
void __iomem *registers;
struct device *dev;
struct ux500_msp_dma_params playback_dma_data;