Commit 2c86446f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: harmony: Drop superfluous address setup 

Harmony driver never uses CONTINUOUS buffer type any longer, hence the
code setting the address is superfluous.  Moreover, the recent change
in the ALSA core already covered the missing address field; it's
already set up.  So let's drop the superfluous line, which includes
the full hw_params callback.

Link: https://lore.kernel.org/r/20210809071250.21846-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ad797a04

sound/parisc/harmony.c

+0 −14
Original line number Diff line number Diff line
@@ -563,22 +563,9 @@ snd_harmony_capture_close(struct snd_pcm_substream *ss) 
        return 0;

}



static int 

snd_harmony_hw_params(struct snd_pcm_substream *ss,

		      struct snd_pcm_hw_params *hw)

{

	struct snd_harmony *h = snd_pcm_substream_chip(ss);

	

	if (h->dma.type == SNDRV_DMA_TYPE_CONTINUOUS)

		ss->runtime->dma_addr = __pa(ss->runtime->dma_area);



	return 0;

}



static const struct snd_pcm_ops snd_harmony_playback_ops = {

	.open =	snd_harmony_playback_open,

	.close = snd_harmony_playback_close,

	.hw_params = snd_harmony_hw_params,

	.prepare = snd_harmony_playback_prepare,

	.trigger = snd_harmony_playback_trigger,

 	.pointer = snd_harmony_playback_pointer,
@@ -587,7 +574,6 @@ static const struct snd_pcm_ops snd_harmony_playback_ops = { 
static const struct snd_pcm_ops snd_harmony_capture_ops = {

        .open = snd_harmony_capture_open,

        .close = snd_harmony_capture_close,

        .hw_params = snd_harmony_hw_params,

        .prepare = snd_harmony_capture_prepare,

        .trigger = snd_harmony_capture_trigger,

        .pointer = snd_harmony_capture_pointer,