Commit 0925e6b2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hdsp: Convert to the new PCM ops 



Replace the copy and the silence ops with the new PCM ops.
The conversion is straightforward with standard helper functions.

Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7b6ae34d

sound/pci/rme9652/hdsp.c

+50 −17
Original line number Diff line number Diff line
@@ -3913,42 +3913,59 @@ static char *hdsp_channel_buffer_location(struct hdsp *hdsp, 
		return hdsp->playback_buffer + (mapped_channel * HDSP_CHANNEL_BUFFER_BYTES);

}



static int snd_hdsp_playback_copy(struct snd_pcm_substream *substream, int channel,

				  snd_pcm_uframes_t pos, void __user *src, snd_pcm_uframes_t count)

static int snd_hdsp_playback_copy(struct snd_pcm_substream *substream,

				  int channel, unsigned long pos,

				  void __user *src, unsigned long count)

{

	struct hdsp *hdsp = snd_pcm_substream_chip(substream);

	char *channel_buf;



	if (snd_BUG_ON(pos + count > HDSP_CHANNEL_BUFFER_BYTES / 4))

	if (snd_BUG_ON(pos + count > HDSP_CHANNEL_BUFFER_BYTES))

		return -EINVAL;



	channel_buf = hdsp_channel_buffer_location (hdsp, substream->pstr->stream, channel);

	if (snd_BUG_ON(!channel_buf))

		return -EIO;

	if (copy_from_user(channel_buf + pos * 4, src, count * 4))

	if (copy_from_user(channel_buf + pos, src, count))

		return -EFAULT;

	return count;

	return 0;

}



static int snd_hdsp_playback_copy_kernel(struct snd_pcm_substream *substream,

					 int channel, unsigned long pos,

					 void *src, unsigned long count)

{

	struct hdsp *hdsp = snd_pcm_substream_chip(substream);

	char *channel_buf;



	channel_buf = hdsp_channel_buffer_location(hdsp, substream->pstr->stream, channel);

	if (snd_BUG_ON(!channel_buf))

		return -EIO;

	memcpy(channel_buf + pos, src, count);

	return 0;

}



static int snd_hdsp_capture_copy(struct snd_pcm_substream *substream, int channel,

				 snd_pcm_uframes_t pos, void __user *dst, snd_pcm_uframes_t count)

static int snd_hdsp_capture_copy(struct snd_pcm_substream *substream,

				 int channel, unsigned long pos,

				 void __user *dst, unsigned long count)

{

	struct hdsp *hdsp = snd_pcm_substream_chip(substream);

	char *channel_buf;



	if (snd_BUG_ON(pos + count > HDSP_CHANNEL_BUFFER_BYTES / 4))

	if (snd_BUG_ON(pos + count > HDSP_CHANNEL_BUFFER_BYTES))

		return -EINVAL;



	channel_buf = hdsp_channel_buffer_location (hdsp, substream->pstr->stream, channel);

	if (snd_BUG_ON(!channel_buf))

		return -EIO;

	if (copy_to_user(dst, channel_buf + pos * 4, count * 4))

	if (copy_to_user(dst, channel_buf + pos, count))

		return -EFAULT;

	return count;

	return 0;

}



static int snd_hdsp_hw_silence(struct snd_pcm_substream *substream, int channel,

				  snd_pcm_uframes_t pos, snd_pcm_uframes_t count)

static int snd_hdsp_capture_copy_kernel(struct snd_pcm_substream *substream,

					int channel, unsigned long pos,

					void *dst, unsigned long count)

{

	struct hdsp *hdsp = snd_pcm_substream_chip(substream);

	char *channel_buf;
@@ -3956,8 +3973,22 @@ static int snd_hdsp_hw_silence(struct snd_pcm_substream *substream, int channel, 
	channel_buf = hdsp_channel_buffer_location(hdsp, substream->pstr->stream, channel);

	if (snd_BUG_ON(!channel_buf))

		return -EIO;

	memset(channel_buf + pos * 4, 0, count * 4);

	return count;

	memcpy(dst, channel_buf + pos, count);

	return 0;

}



static int snd_hdsp_hw_silence(struct snd_pcm_substream *substream,

			       int channel, unsigned long pos,

			       unsigned long count)

{

	struct hdsp *hdsp = snd_pcm_substream_chip(substream);

	char *channel_buf;



	channel_buf = hdsp_channel_buffer_location (hdsp, substream->pstr->stream, channel);

	if (snd_BUG_ON(!channel_buf))

		return -EIO;

	memset(channel_buf + pos, 0, count);

	return 0;

}



static int snd_hdsp_reset(struct snd_pcm_substream *substream)
@@ -4869,8 +4900,9 @@ static const struct snd_pcm_ops snd_hdsp_playback_ops = { 
	.prepare =	snd_hdsp_prepare,

	.trigger =	snd_hdsp_trigger,

	.pointer =	snd_hdsp_hw_pointer,

	.copy =		snd_hdsp_playback_copy,

	.silence =	snd_hdsp_hw_silence,

	.copy_user =	snd_hdsp_playback_copy,

	.copy_kernel =	snd_hdsp_playback_copy_kernel,

	.fill_silence =	snd_hdsp_hw_silence,

};



static const struct snd_pcm_ops snd_hdsp_capture_ops = {
@@ -4881,7 +4913,8 @@ static const struct snd_pcm_ops snd_hdsp_capture_ops = { 
	.prepare =	snd_hdsp_prepare,

	.trigger =	snd_hdsp_trigger,

	.pointer =	snd_hdsp_hw_pointer,

	.copy =		snd_hdsp_capture_copy,

	.copy_user =	snd_hdsp_capture_copy,

	.copy_kernel =	snd_hdsp_capture_copy_kernel,

};



static int snd_hdsp_create_hwdep(struct snd_card *card, struct hdsp *hdsp)