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.

Signed-off-by: Takashi Iwai tiwai@suse.de --- sound/parisc/harmony.c | 14 -------------- 1 file changed, 14 deletions(-)

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index 1440db8b4177..ec4fda324760 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c @@ -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,