From patchwork Wed May 3 10:46:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Sakamoto X-Patchwork-Id: 9709247 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4F50560351 for ; Wed, 3 May 2017 10:46:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40C4B26223 for ; Wed, 3 May 2017 10:46:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 34479285BA; Wed, 3 May 2017 10:46:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C27DE26223 for ; Wed, 3 May 2017 10:46:31 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 88C1D266DBD; Wed, 3 May 2017 12:46:29 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 8D9A9266DBE; Wed, 3 May 2017 12:46:28 +0200 (CEST) Received: from smtp-proxy002.phy.lolipop.jp (smtp-proxy002.phy.lolipop.jp [157.7.104.43]) by alsa0.perex.cz (Postfix) with ESMTP id 8D1532667FE for ; Wed, 3 May 2017 12:46:24 +0200 (CEST) Received: from smtp-proxy002.phy.lolipop.lan (HELO smtp-proxy002.phy.lolipop.jp) (172.19.44.43) (smtp-auth username m12129643-o-takashi, mechanism plain) by smtp-proxy002.phy.lolipop.jp (qpsmtpd/0.82) with ESMTPA; Wed, 03 May 2017 19:46:21 +0900 Received: from 127.0.0.1 (127.0.0.1) by smtp-proxy002.phy.lolipop.jp (LOLIPOP-Fsecure); Wed, 03 May 2017 19:46:21 +0900 (JST) X-Virus-Status: clean(LOLIPOP-Fsecure) To: "Subhransu S. Prusty" , alsa-devel@alsa-project.org References: <1493806055-28046-1-git-send-email-subhransu.s.prusty@intel.com> <1493806055-28046-2-git-send-email-subhransu.s.prusty@intel.com> <7f493fb0-99d2-4de8-1cf3-24ae3324b783@sakamocchi.jp> From: Takashi Sakamoto Message-ID: Date: Wed, 3 May 2017 19:46:21 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <7f493fb0-99d2-4de8-1cf3-24ae3324b783@sakamocchi.jp> Cc: tiwai@suse.de, patches.audio@intel.com, broonie@kernel.org, lgirdwood@gmail.com Subject: Re: [alsa-devel] [PATCH 2/2] ASoC: Intel: Skylake: Fix typo for token d0i3 caps X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP On May 3 2017 19:38, Takashi Sakamoto wrote: > On May 3 2017 19:07, Subhransu S. Prusty wrote: >> Signed-off-by: Subhransu S. Prusty >> --- >> include/uapi/sound/snd_sst_tokens.h | 4 ++-- >> sound/soc/intel/skylake/skl-topology.c | 2 +- >> 2 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/include/uapi/sound/snd_sst_tokens.h b/include/uapi/sound/snd_sst_tokens.h >> index 93392bedcc58..685149dda66b 100644 >> --- a/include/uapi/sound/snd_sst_tokens.h >> +++ b/include/uapi/sound/snd_sst_tokens.h >> @@ -213,8 +213,8 @@ 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_TKN_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; > > $ git annotate include/uapi/sound/snd_sst_tokens.h > 8a0cb2360ddb9 (Vinod Koul 2016-11-03 17:07:18 +0530 215) > SKL_TKN_U32_PMODE, > 6bd9dcf339ebb (Vinod Koul 2016-11-03 17:07:19 +0530 216) > SKL_TKL_U32_D0I3_CAPS, > 6bd9dcf339ebb (Vinod Koul 2016-11-03 17:07:19 +0530 217) > SKL_TKN_MAX = SKL_TKL_U32_D0I3_CAPS, > 15f0d4f531d84 (Shreyas NC 2016-08-12 12:29:50 +0530 218)}; > $ git name-rev --tags 6bd9dcf339ebb > 6bd9dcf339ebb tags/sound-4.10-rc1~3^2~15^2~17 > > The typo was already included in Linux kernel v4.10 and exposed to > userland. In general of kernel development, it's the worst idea to > change it, because it can break userland. Instead of rename, it's better for you to keep the typo and add the correct entry with the same value, like: $ git diff Regards Takashi Sakamoto diff --git a/include/uapi/sound/snd_sst_tokens.h b/include/uapi/sound/snd_sst_tokens.h index 93392bedcc58..b7cc95d04928 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 = SKN_TKL_U32_D0I3_CAPS, + SKL_TKN_MAX = SKL_TKN_U32_D0I3_CAPS, }; #endif