| Message ID | 1493887151-508-2-git-send-email-subhransu.s.prusty@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c0116be3d191393928d39791d203a4495d77b66c |
| Headers | show |
On Thu, May 04, 2017 at 02:09:11PM +0530, Subhransu S. Prusty wrote: > Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> Acked-by: Vinod Koul <vinod.koul@intel.com> > --- > v1->v2 > - Fixed as suggested by Takashi Sakamoto > > include/uapi/sound/snd_sst_tokens.h | 5 +++-- > sound/soc/intel/skylake/skl-topology.c | 2 +- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/include/uapi/sound/snd_sst_tokens.h b/include/uapi/sound/snd_sst_tokens.h > index 93392bedcc58..89b82f6256ad 100644 > --- a/include/uapi/sound/snd_sst_tokens.h > +++ b/include/uapi/sound/snd_sst_tokens.h > @@ -213,8 +213,9 @@ enum SKL_TKNS { > SKL_TKN_U32_LIB_COUNT, > SKL_TKN_STR_LIB_NAME, > SKL_TKN_U32_PMODE, > - SKL_TKL_U32_D0I3_CAPS, > - SKL_TKN_MAX = SKL_TKL_U32_D0I3_CAPS, > + SKL_TKL_U32_D0I3_CAPS, /* Typo added at v4.10 */ > + SKL_TKN_U32_D0I3_CAPS = SKL_TKL_U32_D0I3_CAPS, > + SKL_TKN_MAX = SKL_TKN_U32_D0I3_CAPS, > }; > > #endif > diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c > index 3a99712e44a8..b28199a5348c 100644 > --- a/sound/soc/intel/skylake/skl-topology.c > +++ b/sound/soc/intel/skylake/skl-topology.c > @@ -1995,7 +1995,7 @@ static int skl_tplg_get_token(struct device *dev, > mconfig->converter = tkn_elem->value; > break; > > - case SKL_TKL_U32_D0I3_CAPS: > + case SKL_TKN_U32_D0I3_CAPS: > mconfig->d0i3_caps = tkn_elem->value; > break; > > -- > 1.9.1 >
diff --git a/include/uapi/sound/snd_sst_tokens.h b/include/uapi/sound/snd_sst_tokens.h index 93392bedcc58..89b82f6256ad 100644 --- a/include/uapi/sound/snd_sst_tokens.h +++ b/include/uapi/sound/snd_sst_tokens.h @@ -213,8 +213,9 @@ enum SKL_TKNS { SKL_TKN_U32_LIB_COUNT, SKL_TKN_STR_LIB_NAME, SKL_TKN_U32_PMODE, - SKL_TKL_U32_D0I3_CAPS, - SKL_TKN_MAX = SKL_TKL_U32_D0I3_CAPS, + SKL_TKL_U32_D0I3_CAPS, /* Typo added at v4.10 */ + SKL_TKN_U32_D0I3_CAPS = SKL_TKL_U32_D0I3_CAPS, + SKL_TKN_MAX = SKL_TKN_U32_D0I3_CAPS, }; #endif diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 3a99712e44a8..b28199a5348c 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -1995,7 +1995,7 @@ static int skl_tplg_get_token(struct device *dev, mconfig->converter = tkn_elem->value; break; - case SKL_TKL_U32_D0I3_CAPS: + case SKL_TKN_U32_D0I3_CAPS: mconfig->d0i3_caps = tkn_elem->value; break;
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> --- v1->v2 - Fixed as suggested by Takashi Sakamoto include/uapi/sound/snd_sst_tokens.h | 5 +++-- sound/soc/intel/skylake/skl-topology.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)