From: Vinod Koul <vinod.koul@intel.com>
To: alsa-devel@alsa-project.org
Cc: Vinod Koul <vinod.koul@intel.com>,
jeeja.kp@intel.com, broonie@kernel.org,
subhransu.s.prusty@intel.com, lgirdwood@gmail.com
Subject: [PATCH 6/6] ASoC: Intel: rename pcm dias to media dai
Date: Mon, 5 May 2014 14:27:52 +0530 [thread overview]
Message-ID: <1399280272-26644-7-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1399280272-26644-1-git-send-email-vinod.koul@intel.com>
this is for further updates to driver which supports DPCM :)
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
sound/soc/intel/sst-mfld-platform-pcm.c | 38 +++++++++++++++---------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/sound/soc/intel/sst-mfld-platform-pcm.c b/sound/soc/intel/sst-mfld-platform-pcm.c
index 3f9cd77..dac6cec 100644
--- a/sound/soc/intel/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/sst-mfld-platform-pcm.c
@@ -95,7 +95,7 @@ static struct snd_pcm_hardware sst_platform_pcm_hw = {
/* MFLD - MSIC */
static struct snd_soc_dai_driver sst_platform_dai[] = {
{
- .name = "Headset-cpu-dai",
+ .name = "media-cpu-dai",
.id = 0,
.playback = {
.channels_min = SST_STEREO,
@@ -235,13 +235,13 @@ static int sst_platform_init_stream(struct snd_pcm_substream *substream)
}
/* end -- helper functions */
-static int sst_platform_open(struct snd_pcm_substream *substream)
+static int sst_platform_media_open(struct snd_pcm_substream *substream)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct sst_runtime_stream *stream;
int ret_val;
- pr_debug("sst_platform_open called\n");
+ pr_debug("sst_platform_media_open called\n");
snd_soc_set_runtime_hwparams(substream, &sst_platform_pcm_hw);
ret_val = snd_pcm_hw_constraint_integer(runtime,
@@ -279,12 +279,12 @@ static int sst_platform_open(struct snd_pcm_substream *substream)
return 0;
}
-static int sst_platform_close(struct snd_pcm_substream *substream)
+static int sst_platform_media_close(struct snd_pcm_substream *substream)
{
struct sst_runtime_stream *stream;
int ret_val = 0, str_id;
- pr_debug("sst_platform_close called\n");
+ pr_debug("sst_platform_media_close called\n");
stream = substream->runtime->private_data;
str_id = stream->stream_info.str_id;
if (str_id)
@@ -294,12 +294,12 @@ static int sst_platform_close(struct snd_pcm_substream *substream)
return ret_val;
}
-static int sst_platform_pcm_prepare(struct snd_pcm_substream *substream)
+static int sst_platform_pcm_media_prepare(struct snd_pcm_substream *substream)
{
struct sst_runtime_stream *stream;
int ret_val = 0, str_id;
- pr_debug("sst_platform_pcm_prepare called\n");
+ pr_debug("sst_platform_pcm_media_prepare called\n");
stream = substream->runtime->private_data;
str_id = stream->stream_info.str_id;
if (stream->stream_info.str_id) {
@@ -321,14 +321,14 @@ static int sst_platform_pcm_prepare(struct snd_pcm_substream *substream)
return ret_val;
}
-static int sst_platform_pcm_trigger(struct snd_pcm_substream *substream,
+static int sst_platform_pcm_media_trigger(struct snd_pcm_substream *substream,
int cmd)
{
int ret_val = 0, str_id;
struct sst_runtime_stream *stream;
int str_cmd, status;
- pr_debug("sst_platform_pcm_trigger called\n");
+ pr_debug("sst_platform_pcm_media_trigger called\n");
stream = substream->runtime->private_data;
str_id = stream->stream_info.str_id;
switch (cmd) {
@@ -364,7 +364,7 @@ static int sst_platform_pcm_trigger(struct snd_pcm_substream *substream,
}
-static snd_pcm_uframes_t sst_platform_pcm_pointer
+static snd_pcm_uframes_t sst_platform_pcm_media_pointer
(struct snd_pcm_substream *substream)
{
struct sst_runtime_stream *stream;
@@ -385,7 +385,7 @@ static snd_pcm_uframes_t sst_platform_pcm_pointer
return stream->stream_info.buffer_ptr;
}
-static int sst_platform_pcm_hw_params(struct snd_pcm_substream *substream,
+static int sst_platform_pcm_media_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
@@ -394,20 +394,20 @@ static int sst_platform_pcm_hw_params(struct snd_pcm_substream *substream,
return 0;
}
-static int sst_platform_pcm_hw_free(struct snd_pcm_substream *substream)
+static int sst_platform_pcm_media_hw_free(struct snd_pcm_substream *substream)
{
return snd_pcm_lib_free_pages(substream);
}
static struct snd_pcm_ops sst_platform_ops = {
- .open = sst_platform_open,
- .close = sst_platform_close,
+ .open = sst_platform_media_open,
+ .close = sst_platform_media_close,
.ioctl = snd_pcm_lib_ioctl,
- .prepare = sst_platform_pcm_prepare,
- .trigger = sst_platform_pcm_trigger,
- .pointer = sst_platform_pcm_pointer,
- .hw_params = sst_platform_pcm_hw_params,
- .hw_free = sst_platform_pcm_hw_free,
+ .prepare = sst_platform_pcm_media_prepare,
+ .trigger = sst_platform_pcm_media_trigger,
+ .pointer = sst_platform_pcm_media_pointer,
+ .hw_params = sst_platform_pcm_media_hw_params,
+ .hw_free = sst_platform_pcm_media_hw_free,
};
static void sst_pcm_free(struct snd_pcm *pcm)
--
1.7.0.4
prev parent reply other threads:[~2014-05-05 9:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-05 8:57 [PATCH 0/6] ASoC: Intel: rework the mfld platform driver Vinod Koul
2014-05-05 8:57 ` [PATCH 1/6] ASoC: Intel: remove FSF snail mail address Vinod Koul
2014-05-05 8:57 ` [PATCH 2/6] ASoc: Intel: rename sst-mfld-platform.c Vinod Koul
2014-05-05 8:57 ` [PATCH 3/6] ASoC: Intel: mark sst_set_stream_status as non static Vinod Koul
2014-05-05 8:57 ` [PATCH 4/6] ASoC: Intel: split the pcm and compress to different files Vinod Koul
2014-05-05 8:57 ` [PATCH 5/6] ASoC: Intel: remove unused sst-mfld platform dais Vinod Koul
2014-05-05 8:57 ` Vinod Koul [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399280272-26644-7-git-send-email-vinod.koul@intel.com \
--to=vinod.koul@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=jeeja.kp@intel.com \
--cc=lgirdwood@gmail.com \
--cc=subhransu.s.prusty@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox