diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-03-03 14:20:56 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-03-03 14:20:56 +0100 |
| commit | 26ed1d29fc44f3f2f0c396c1392abefac5f0454e (patch) | |
| tree | ffba9ebddf759f04cbeca8adace5cc8093c58c2d /sound/soc/codecs/rt1318-sdw.c | |
| parent | e97fc9cffbb9f372b53b42c36cd7b20aab44a554 (diff) | |
| parent | 7933b90b42896f5b6596e6a829bb31c5121fc2a9 (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/codecs/rt1318-sdw.c')
| -rw-r--r-- | sound/soc/codecs/rt1318-sdw.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt1318-sdw.c b/sound/soc/codecs/rt1318-sdw.c index f85f5ab2c6d0..c34975f958c4 100644 --- a/sound/soc/codecs/rt1318-sdw.c +++ b/sound/soc/codecs/rt1318-sdw.c @@ -575,10 +575,7 @@ static int rt1318_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, stream->sdw_stream = sdw_stream; /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - dai->playback_dma_data = stream; - else - dai->capture_dma_data = stream; + snd_soc_dai_dma_data_set(dai, direction, stream); return 0; } @@ -697,7 +694,7 @@ static int rt1318_sdw_pcm_hw_free(struct snd_pcm_substream *substream, * slave_ops: callbacks for get_clock_stop_mode, clock_stop and * port_prep are not defined for now */ -static struct sdw_slave_ops rt1318_slave_ops = { +static const struct sdw_slave_ops rt1318_slave_ops = { .read_prop = rt1318_read_prop, .update_status = rt1318_update_status, }; |