From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17BA0C10F0B for ; Thu, 18 Apr 2019 05:17:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E64582183E for ; Thu, 18 Apr 2019 05:17:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731225AbfDRFR6 (ORCPT ); Thu, 18 Apr 2019 01:17:58 -0400 Received: from mx2.suse.de ([195.135.220.15]:39160 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725876AbfDRFR4 (ORCPT ); Thu, 18 Apr 2019 01:17:56 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 45D7CADD4; Thu, 18 Apr 2019 05:17:55 +0000 (UTC) Date: Thu, 18 Apr 2019 07:17:54 +0200 Message-ID: From: Takashi Iwai To: "Jacek Anaszewski" Cc: , "Arnd Bergmann" , , , "Jaroslav Kysela" , , , , , Subject: Re: [PATCH v4 01/26] ALSA: line6: Avoid polluting led_* namespace In-Reply-To: <20190417205439.17685-2-jacek.anaszewski@gmail.com> References: <20190417205439.17685-1-jacek.anaszewski@gmail.com> <20190417205439.17685-2-jacek.anaszewski@gmail.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 17 Apr 2019 22:54:14 +0200, Jacek Anaszewski wrote: > > led_colors clashes with the array of the same name being added > to the LED class. Do the following amendments to fix this issue > and the other prospective one. > > led_colors -> toneport_led_colors > led_init_vals -> toneport_led_init_vals > > Fixes: f44edd7b2bbed ("ALSA: line6/toneport: Implement LED controls via LED class") > Signed-off-by: Jacek Anaszewski > Cc: Jaroslav Kysela > Cc: Takashi Iwai > Cc: Arnd Bergmann Looks good. Feel free to take my ack: Reviewed-by: Takashi Iwai thanks, Takashi > --- > sound/usb/line6/toneport.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c > index f47ba94e6f4a..56875526b182 100644 > --- a/sound/usb/line6/toneport.c > +++ b/sound/usb/line6/toneport.c > @@ -291,8 +291,8 @@ static bool toneport_has_led(struct usb_line6_toneport *toneport) > } > } > > -static const char * const led_colors[2] = { "red", "green" }; > -static const int led_init_vals[2] = { 0x00, 0x26 }; > +static const char * const toneport_led_colors[2] = { "red", "green" }; > +static const int toneport_led_init_vals[2] = { 0x00, 0x26 }; > > static void toneport_update_led(struct usb_line6_toneport *toneport) > { > @@ -320,9 +320,9 @@ static int toneport_init_leds(struct usb_line6_toneport *toneport) > > led->toneport = toneport; > snprintf(led->name, sizeof(led->name), "%s::%s", > - dev_name(dev), led_colors[i]); > + dev_name(dev), toneport_led_colors[i]); > leddev->name = led->name; > - leddev->brightness = led_init_vals[i]; > + leddev->brightness = toneport_led_init_vals[i]; > leddev->max_brightness = 0x26; > leddev->brightness_set = toneport_led_brightness_set; > err = led_classdev_register(dev, leddev); > -- > 2.11.0 > >