ASoC: rsnd: use defined io_playback/io_capture
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 6 Nov 2018 05:19:33 +0000 (05:19 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 6 Nov 2018 17:39:04 +0000 (17:39 +0000)
rdai->playback/rdai->capture are defined as io_playback/io_capture
on __rsnd_dai_probe(). Let's use it instead of original one.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sh/rcar/core.c

index cbe846e..cb59219 100644 (file)
@@ -1091,24 +1091,24 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv,
        drv->name       = rdai->name;
        drv->ops        = &rsnd_soc_dai_ops;
 
-       snprintf(rdai->playback.name, RSND_DAI_NAME_SIZE,
+       snprintf(io_playback->name, RSND_DAI_NAME_SIZE,
                 "DAI%d Playback", dai_i);
        drv->playback.rates             = RSND_RATES;
        drv->playback.formats           = RSND_FMTS;
        drv->playback.channels_min      = 2;
        drv->playback.channels_max      = 8;
-       drv->playback.stream_name       = rdai->playback.name;
+       drv->playback.stream_name       = io_playback->name;
 
-       snprintf(rdai->capture.name, RSND_DAI_NAME_SIZE,
+       snprintf(io_capture->name, RSND_DAI_NAME_SIZE,
                 "DAI%d Capture", dai_i);
        drv->capture.rates              = RSND_RATES;
        drv->capture.formats            = RSND_FMTS;
        drv->capture.channels_min       = 2;
        drv->capture.channels_max       = 8;
-       drv->capture.stream_name        = rdai->capture.name;
+       drv->capture.stream_name        = io_capture->name;
 
-       rdai->playback.rdai             = rdai;
-       rdai->capture.rdai              = rdai;
+       io_playback->rdai               = rdai;
+       io_capture->rdai                = rdai;
        rsnd_rdai_channels_set(rdai, 2); /* default 2ch */
        rsnd_rdai_ssi_lane_set(rdai, 1); /* default 1lane */
        rsnd_rdai_width_set(rdai, 32);   /* default 32bit width */