From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Sakamoto Subject: Re: [PATCH] sound: use enum names instead of magic numbers Date: Sun, 30 Nov 2014 13:52:02 +0900 Message-ID: <547AA272.6070308@sakamocchi.jp> References: <1417201196-12392-1-git-send-email-KyleChamberlin@project20million.org> <1417294692.818.3.camel@perches.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp302.phy.lolipop.jp (smtp302.phy.lolipop.jp [210.157.22.85]) by alsa0.perex.cz (Postfix) with ESMTP id F266A260434 for ; Sun, 30 Nov 2014 05:52:05 +0100 (CET) In-Reply-To: <1417294692.818.3.camel@perches.com> 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 To: Joe Perches , Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org List-Id: alsa-devel@alsa-project.org T24gMjAxNOW5tDEx5pyIMzDml6UgMDU6NTgsIEpvZSBQZXJjaGVzIHdyb3RlOgo+IFRoZXJlJ3Mg YW4gZW51bSBkZWZpbmVkIGZvciB0aGVzZSBtYWdpYyBudW1iZXJzLAo+IG1pZ2h0IGFzIHdlbGwg dXNlIGl0Lgo+IAo+IE1pc2NlbGxhbmVhOgo+IG8gVXNlICMjX19WQV9BUkdTX18KPiAKPiBTaWdu ZWQtb2ZmLWJ5OiBKb2UgUGVyY2hlcyA8am9lQHBlcmNoZXMuY29tPgo+IC0tLQo+ICBpbmNsdWRl L3NvdW5kL2NvcmUuaCB8IDI4ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KPiAgc291bmQv Y29yZS9taXNjLmMgICAgfCAgNiArKystLS0KPiAgMiBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRp b25zKCspLCAxNiBkZWxldGlvbnMoLSkKCkkgdGhpbmsgaXQgYmV0dGVyIHRvIHNwbGl0IHRoaXMg cGF0Y2ggaW50byB0d28gcGFydHMsIG9uZSBpcyBmb3IKZW51bWVyYXRpb24gaWRlbnRpZmllciBh bmQgYW5vdGhlciBpcyBmb3IgdmFyaWFkaWMgbWFjcm8uCgo+IGRpZmYgLS1naXQgYS9pbmNsdWRl L3NvdW5kL2NvcmUuaCBiL2luY2x1ZGUvc291bmQvY29yZS5oCj4gaW5kZXggMWRmM2YyZi4uNDA0 MThlNyAxMDA2NDQKPiAtLS0gYS9pbmNsdWRlL3NvdW5kL2NvcmUuaAo+ICsrKyBiL2luY2x1ZGUv c291bmQvY29yZS5oCj4gQEAgLTMyNSw3ICszMjUsNyBAQCB2b2lkIHJlbGVhc2VfYW5kX2ZyZWVf cmVzb3VyY2Uoc3RydWN0IHJlc291cmNlICpyZXMpOwo+ICAvKiAtLS0gKi8KPiAgCj4gIC8qIHNv dW5kIHByaW50ayBkZWJ1ZyBsZXZlbHMgKi8KPiAtZW51bSB7Cj4gK2VudW0gc25kX2xldmVsIHsK PiAgCVNORF9QUl9BTFdBWVMsCj4gIAlTTkRfUFJfREVCVUcsCj4gIAlTTkRfUFJfVkVSQk9TRSwK PiBAQCAtMzMzLDExICszMzMsMTEgQEAgZW51bSB7Cj4gIAo+ICAjaWYgZGVmaW5lZChDT05GSUdf U05EX0RFQlVHKSB8fCBkZWZpbmVkKENPTkZJR19TTkRfVkVSQk9TRV9QUklOVEspCj4gIF9fcHJp bnRmKDQsIDUpCj4gLXZvaWQgX19zbmRfcHJpbnRrKHVuc2lnbmVkIGludCBsZXZlbCwgY29uc3Qg Y2hhciAqZmlsZSwgaW50IGxpbmUsCj4gK3ZvaWQgX19zbmRfcHJpbnRrKGVudW0gc25kX2xldmVs IHNuZF9sZXZlbCwgY29uc3QgY2hhciAqZmlsZSwgaW50IGxpbmUsCj4gIAkJICBjb25zdCBjaGFy ICpmb3JtYXQsIC4uLik7Cj4gICNlbHNlCj4gLSNkZWZpbmUgX19zbmRfcHJpbnRrKGxldmVsLCBm aWxlLCBsaW5lLCBmb3JtYXQsIGFyZ3MuLi4pIFwKPiAtCXByaW50ayhmb3JtYXQsICMjYXJncykK PiArI2RlZmluZSBfX3NuZF9wcmludGsoc25kX2xldmVsLCBmaWxlLCBsaW5lLCBmb3JtYXQsIC4u LikgXAo+ICsJcHJpbnRrKGZvcm1hdCwgIyNfX1ZBX0FSR1NfXykKPiAgI2VuZGlmCj4gIC8qKgo+ IEBAIC0zNDcsOCArMzQ3LDggQEAgdm9pZCBfX3NuZF9wcmludGsodW5zaWduZWQgaW50IGxldmVs LCBjb25zdCBjaGFyICpmaWxlLCBpbnQgbGluZSwKPiAgICogV29ya3MgbGlrZSBwcmludGsoKSBi dXQgcHJpbnRzIHRoZSBmaWxlIGFuZCB0aGUgbGluZSBvZiB0aGUgY2FsbGVyCj4gICAqIHdoZW4g Y29uZmlndXJlZCB3aXRoIENPTkZJR19TTkRfVkVSQk9TRV9QUklOVEsuCj4gICAqLwo+IC0jZGVm aW5lIHNuZF9wcmludGsoZm10LCBhcmdzLi4uKSBcCj4gLQlfX3NuZF9wcmludGsoMCwgX19GSUxF X18sIF9fTElORV9fLCBmbXQsICMjYXJncykKPiArI2RlZmluZSBzbmRfcHJpbnRrKGZtdCwgLi4u KSBcCj4gKwlfX3NuZF9wcmludGsoU05EX1BSX0FMV0FZUywgX19GSUxFX18sIF9fTElORV9fLCBm bXQsICMjX19WQV9BUkdTX18pCj4gIAo+ICAjaWZkZWYgQ09ORklHX1NORF9ERUJVRwo+ICAvKioK PiBAQCAtMzU4LDEwICszNTgsMTAgQEAgdm9pZCBfX3NuZF9wcmludGsodW5zaWduZWQgaW50IGxl dmVsLCBjb25zdCBjaGFyICpmaWxlLCBpbnQgbGluZSwKPiAgICogV29ya3MgbGlrZSBzbmRfcHJp bnRrKCkgZm9yIGRlYnVnZ2luZyBwdXJwb3Nlcy4KPiAgICogSWdub3JlZCB3aGVuIENPTkZJR19T TkRfREVCVUcgaXMgbm90IHNldC4KPiAgICovCj4gLSNkZWZpbmUgc25kX3ByaW50ZChmbXQsIGFy Z3MuLi4pIFwKPiAtCV9fc25kX3ByaW50aygxLCBfX0ZJTEVfXywgX19MSU5FX18sIGZtdCwgIyNh cmdzKQo+IC0jZGVmaW5lIF9zbmRfcHJpbnRkKGxldmVsLCBmbXQsIGFyZ3MuLi4pIFwKPiAtCV9f c25kX3ByaW50ayhsZXZlbCwgX19GSUxFX18sIF9fTElORV9fLCBmbXQsICMjYXJncykKPiArI2Rl ZmluZSBzbmRfcHJpbnRkKGZtdCwgLi4uKSBcCj4gKwlfX3NuZF9wcmludGsoU05EX1BSX0RFQlVH LCBfX0ZJTEVfXywgX19MSU5FX18sIGZtdCwgIyNfX1ZBX0FSR1NfXykKPiArI2RlZmluZSBfc25k X3ByaW50ZChsZXZlbCwgZm10LCAuLi4pIFwKPiArCV9fc25kX3ByaW50ayhsZXZlbCwgX19GSUxF X18sIF9fTElORV9fLCBmbXQsICMjX19WQV9BUkdTX18pCj4gIAo+ICAvKioKPiAgICogc25kX0JV RyAtIGdpdmUgYSBCVUcgd2FybmluZyBtZXNzYWdlIGFuZCBzdGFjayB0cmFjZQo+IEBAIC0zOTAs NyArMzkwLDggQEAgdm9pZCBfX3NuZF9wcmludGsodW5zaWduZWQgaW50IGxldmVsLCBjb25zdCBj aGFyICpmaWxlLCBpbnQgbGluZSwKPiAgX19wcmludGYoMSwgMikKPiAgc3RhdGljIGlubGluZSB2 b2lkIHNuZF9wcmludGQoY29uc3QgY2hhciAqZm9ybWF0LCAuLi4pIHt9Cj4gIF9fcHJpbnRmKDIs IDMpCj4gLXN0YXRpYyBpbmxpbmUgdm9pZCBfc25kX3ByaW50ZChpbnQgbGV2ZWwsIGNvbnN0IGNo YXIgKmZvcm1hdCwgLi4uKSB7fQo+ICtzdGF0aWMgaW5saW5lIHZvaWQgX3NuZF9wcmludGQoZW51 bSBzbmRfbGV2ZWwgc25kX2xldmVsLAo+ICsJCQkgICAgICAgY29uc3QgY2hhciAqZm9ybWF0LCAu Li4pIHt9Cj4gIAo+ICAjZGVmaW5lIHNuZF9CVUcoKQkJCWRvIHsgfSB3aGlsZSAoMCkKPiAgCj4g QEAgLTQxMSw4ICs0MTIsOSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgc25kX3ByaW50ZF9yYXRlbGlt aXQodm9pZCkgeyByZXR1cm4gZmFsc2U7IH0KPiAgICogV29ya3MgbGlrZSBzbmRfcHJpbnRrKCkg Zm9yIGRlYnVnZ2luZyBwdXJwb3Nlcy4KPiAgICogSWdub3JlZCB3aGVuIENPTkZJR19TTkRfREVC VUdfVkVSQk9TRSBpcyBub3Qgc2V0Lgo+ICAgKi8KPiAtI2RlZmluZSBzbmRfcHJpbnRkZChmb3Jt YXQsIGFyZ3MuLi4pIFwKPiAtCV9fc25kX3ByaW50aygyLCBfX0ZJTEVfXywgX19MSU5FX18sIGZv cm1hdCwgIyNhcmdzKQo+ICsjZGVmaW5lIHNuZF9wcmludGRkKGZvcm1hdCwgLi4uKQkJCQlcCj4g KwlfX3NuZF9wcmludGsoU05EX1BSX1ZFUkJPU0UsIF9fRklMRV9fLCBfX0xJTkVfXywJXAo+ICsJ CSAgICAgZm9ybWF0LCAjI19fVkFfQVJHU19fKQo+ICAjZWxzZQo+ICBfX3ByaW50ZigxLCAyKQo+ ICBzdGF0aWMgaW5saW5lIHZvaWQgc25kX3ByaW50ZGQoY29uc3QgY2hhciAqZm9ybWF0LCAuLi4p IHt9Cj4gZGlmZiAtLWdpdCBhL3NvdW5kL2NvcmUvbWlzYy5jIGIvc291bmQvY29yZS9taXNjLmMK PiBpbmRleCBmMmU4MjI2Li4wM2IzZjU2IDEwMDY0NAo+IC0tLSBhL3NvdW5kL2NvcmUvbWlzYy5j Cj4gKysrIGIvc291bmQvY29yZS9taXNjLmMKPiBAQCAtNjMsNyArNjMsNyBAQCBzdGF0aWMgY29u c3QgY2hhciAqc2FuaXR5X2ZpbGVfbmFtZShjb25zdCBjaGFyICpwYXRoKQo+ICAjZW5kaWYKPiAg Cj4gICNpZiBkZWZpbmVkKENPTkZJR19TTkRfREVCVUcpIHx8IGRlZmluZWQoQ09ORklHX1NORF9W RVJCT1NFX1BSSU5USykKPiAtdm9pZCBfX3NuZF9wcmludGsodW5zaWduZWQgaW50IGxldmVsLCBj b25zdCBjaGFyICpwYXRoLCBpbnQgbGluZSwKPiArdm9pZCBfX3NuZF9wcmludGsoZW51bSBzbmRf bGV2ZWwgc25kX2xldmVsLCBjb25zdCBjaGFyICpwYXRoLCBpbnQgbGluZSwKPiAgCQkgIGNvbnN0 IGNoYXIgKmZvcm1hdCwgLi4uKQo+ICB7Cj4gIAl2YV9saXN0IGFyZ3M7Cj4gQEAgLTc0LDcgKzc0 LDcgQEAgdm9pZCBfX3NuZF9wcmludGsodW5zaWduZWQgaW50IGxldmVsLCBjb25zdCBjaGFyICpw YXRoLCBpbnQgbGluZSwKPiAgI2VuZGlmCj4gIAo+ICAjaWZkZWYgQ09ORklHX1NORF9ERUJVRwo+ IC0JaWYgKGRlYnVnIDwgbGV2ZWwpCj4gKwlpZiAoZGVidWcgPCBzbmRfbGV2ZWwpCj4gIAkJcmV0 dXJuOwo+ICAjZW5kaWYKPiAgCj4gQEAgLTg4LDcgKzg4LDcgQEAgdm9pZCBfX3NuZF9wcmludGso dW5zaWduZWQgaW50IGxldmVsLCBjb25zdCBjaGFyICpwYXRoLCBpbnQgbGluZSwKPiAgCQljb25z dCBjaGFyICplbmRfb2ZfaGVhZGVyID0gcHJpbnRrX3NraXBfbGV2ZWwoZm9ybWF0KTsKPiAgCQlt ZW1jcHkodmVyYm9zZV9mbXQsIGZvcm1hdCwgZW5kX29mX2hlYWRlciAtIGZvcm1hdCk7Cj4gIAkJ dmFmLmZtdCA9IGVuZF9vZl9oZWFkZXI7Cj4gLQl9IGVsc2UgaWYgKGxldmVsKQo+ICsJfSBlbHNl IGlmIChzbmRfbGV2ZWwpCj4gIAkJbWVtY3B5KHZlcmJvc2VfZm10LCBLRVJOX0RFQlVHLCBzaXpl b2YoS0VSTl9ERUJVRykgLSAxKTsKPiAgCXByaW50ayh2ZXJib3NlX2ZtdCwgc2FuaXR5X2ZpbGVf bmFtZShwYXRoKSwgbGluZSwgJnZhZik7CgpUaGVyZSdzIG5vIG5lZWQgdG8gcmVuYW1lIHZhcmlh YmxlIG5hbWVzLgoKClJlZ2FyZHMKClRha2FzaGkgU2FrYW1vdG8Kby10YWthc2hpQHNha2Ftb2Nj aGkuanAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFs c2EtZGV2ZWwgbWFpbGluZyBsaXN0CkFsc2EtZGV2ZWxAYWxzYS1wcm9qZWN0Lm9yZwpodHRwOi8v bWFpbG1hbi5hbHNhLXByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8vYWxzYS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751892AbaK3E5X (ORCPT ); Sat, 29 Nov 2014 23:57:23 -0500 Received: from smtp302.phy.lolipop.jp ([210.157.22.85]:53122 "EHLO smtp302.phy.lolipop.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751705AbaK3E5W (ORCPT ); Sat, 29 Nov 2014 23:57:22 -0500 X-Greylist: delayed 318 seconds by postgrey-1.27 at vger.kernel.org; Sat, 29 Nov 2014 23:57:22 EST Message-ID: <547AA272.6070308@sakamocchi.jp> Date: Sun, 30 Nov 2014 13:52:02 +0900 From: Takashi Sakamoto User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Joe Perches , Takashi Iwai CC: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] sound: use enum names instead of magic numbers References: <1417201196-12392-1-git-send-email-KyleChamberlin@project20million.org> <1417294692.818.3.camel@perches.com> In-Reply-To: <1417294692.818.3.camel@perches.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2014年11月30日 05:58, Joe Perches wrote: > There's an enum defined for these magic numbers, > might as well use it. > > Miscellanea: > o Use ##__VA_ARGS__ > > Signed-off-by: Joe Perches > --- > include/sound/core.h | 28 +++++++++++++++------------- > sound/core/misc.c | 6 +++--- > 2 files changed, 18 insertions(+), 16 deletions(-) I think it better to split this patch into two parts, one is for enumeration identifier and another is for variadic macro. > diff --git a/include/sound/core.h b/include/sound/core.h > index 1df3f2f..40418e7 100644 > --- a/include/sound/core.h > +++ b/include/sound/core.h > @@ -325,7 +325,7 @@ void release_and_free_resource(struct resource *res); > /* --- */ > > /* sound printk debug levels */ > -enum { > +enum snd_level { > SND_PR_ALWAYS, > SND_PR_DEBUG, > SND_PR_VERBOSE, > @@ -333,11 +333,11 @@ enum { > > #if defined(CONFIG_SND_DEBUG) || defined(CONFIG_SND_VERBOSE_PRINTK) > __printf(4, 5) > -void __snd_printk(unsigned int level, const char *file, int line, > +void __snd_printk(enum snd_level snd_level, const char *file, int line, > const char *format, ...); > #else > -#define __snd_printk(level, file, line, format, args...) \ > - printk(format, ##args) > +#define __snd_printk(snd_level, file, line, format, ...) \ > + printk(format, ##__VA_ARGS__) > #endif > /** > @@ -347,8 +347,8 @@ void __snd_printk(unsigned int level, const char *file, int line, > * Works like printk() but prints the file and the line of the caller > * when configured with CONFIG_SND_VERBOSE_PRINTK. > */ > -#define snd_printk(fmt, args...) \ > - __snd_printk(0, __FILE__, __LINE__, fmt, ##args) > +#define snd_printk(fmt, ...) \ > + __snd_printk(SND_PR_ALWAYS, __FILE__, __LINE__, fmt, ##__VA_ARGS__) > > #ifdef CONFIG_SND_DEBUG > /** > @@ -358,10 +358,10 @@ void __snd_printk(unsigned int level, const char *file, int line, > * Works like snd_printk() for debugging purposes. > * Ignored when CONFIG_SND_DEBUG is not set. > */ > -#define snd_printd(fmt, args...) \ > - __snd_printk(1, __FILE__, __LINE__, fmt, ##args) > -#define _snd_printd(level, fmt, args...) \ > - __snd_printk(level, __FILE__, __LINE__, fmt, ##args) > +#define snd_printd(fmt, ...) \ > + __snd_printk(SND_PR_DEBUG, __FILE__, __LINE__, fmt, ##__VA_ARGS__) > +#define _snd_printd(level, fmt, ...) \ > + __snd_printk(level, __FILE__, __LINE__, fmt, ##__VA_ARGS__) > > /** > * snd_BUG - give a BUG warning message and stack trace > @@ -390,7 +390,8 @@ void __snd_printk(unsigned int level, const char *file, int line, > __printf(1, 2) > static inline void snd_printd(const char *format, ...) {} > __printf(2, 3) > -static inline void _snd_printd(int level, const char *format, ...) {} > +static inline void _snd_printd(enum snd_level snd_level, > + const char *format, ...) {} > > #define snd_BUG() do { } while (0) > > @@ -411,8 +412,9 @@ static inline bool snd_printd_ratelimit(void) { return false; } > * Works like snd_printk() for debugging purposes. > * Ignored when CONFIG_SND_DEBUG_VERBOSE is not set. > */ > -#define snd_printdd(format, args...) \ > - __snd_printk(2, __FILE__, __LINE__, format, ##args) > +#define snd_printdd(format, ...) \ > + __snd_printk(SND_PR_VERBOSE, __FILE__, __LINE__, \ > + format, ##__VA_ARGS__) > #else > __printf(1, 2) > static inline void snd_printdd(const char *format, ...) {} > diff --git a/sound/core/misc.c b/sound/core/misc.c > index f2e8226..03b3f56 100644 > --- a/sound/core/misc.c > +++ b/sound/core/misc.c > @@ -63,7 +63,7 @@ static const char *sanity_file_name(const char *path) > #endif > > #if defined(CONFIG_SND_DEBUG) || defined(CONFIG_SND_VERBOSE_PRINTK) > -void __snd_printk(unsigned int level, const char *path, int line, > +void __snd_printk(enum snd_level snd_level, const char *path, int line, > const char *format, ...) > { > va_list args; > @@ -74,7 +74,7 @@ void __snd_printk(unsigned int level, const char *path, int line, > #endif > > #ifdef CONFIG_SND_DEBUG > - if (debug < level) > + if (debug < snd_level) > return; > #endif > > @@ -88,7 +88,7 @@ void __snd_printk(unsigned int level, const char *path, int line, > const char *end_of_header = printk_skip_level(format); > memcpy(verbose_fmt, format, end_of_header - format); > vaf.fmt = end_of_header; > - } else if (level) > + } else if (snd_level) > memcpy(verbose_fmt, KERN_DEBUG, sizeof(KERN_DEBUG) - 1); > printk(verbose_fmt, sanity_file_name(path), line, &vaf); There's no need to rename variable names. Regards Takashi Sakamoto o-takashi@sakamocchi.jp