From patchwork Mon Nov 18 20:40:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 3199031 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A76129F26C for ; Mon, 18 Nov 2013 20:40:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C1792203E1 for ; Mon, 18 Nov 2013 20:40:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C871420380 for ; Mon, 18 Nov 2013 20:40:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751923Ab3KRUkI (ORCPT ); Mon, 18 Nov 2013 15:40:08 -0500 Received: from mail.skyhub.de ([78.46.96.112]:49639 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751754Ab3KRUkG (ORCPT ); Mon, 18 Nov 2013 15:40:06 -0500 X-Virus-Scanned: Nedap ESD1 at mail.skyhub.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1384807205; bh=PuleBuVD9j87EVdDehbMjE84kc5yvqcY8a8TJGsSqoA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Transfer-Encoding:In-Reply-To; b=DYIehxbufXFN OMumJgjyVwhlZm9CU/n+OMy6budg1pfL5+ZtIUQnG1wxlnMfMUapMFwAdQ7bhP1OowZ NzNmx003JRtNrP2KnA+JJs/Xrww9rx/DHBIHmI2glYAcVR4K+dpWLZ5BaJyTJYLWrnl NDs2TP4tbZlug8fhPW521+7lo= Received: from mail.skyhub.de ([127.0.0.1]) by localhost (door.skyhub.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id pm8KiPwHfEWp; Mon, 18 Nov 2013 21:40:05 +0100 (CET) Received: from liondog.tnic (p54B7E49A.dip0.t-ipconnect.de [84.183.228.154]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id D2F001DA258; Mon, 18 Nov 2013 21:40:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1384807205; bh=PuleBuVD9j87EVdDehbMjE84kc5yvqcY8a8TJGsSqoA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Transfer-Encoding:In-Reply-To; b=DYIehxbufXFN OMumJgjyVwhlZm9CU/n+OMy6budg1pfL5+ZtIUQnG1wxlnMfMUapMFwAdQ7bhP1OowZ NzNmx003JRtNrP2KnA+JJs/Xrww9rx/DHBIHmI2glYAcVR4K+dpWLZ5BaJyTJYLWrnl NDs2TP4tbZlug8fhPW521+7lo= Received: by liondog.tnic (Postfix, from userid 1000) id 2BAB0107160; Mon, 18 Nov 2013 21:40:03 +0100 (CET) Date: Mon, 18 Nov 2013 21:40:03 +0100 From: Borislav Petkov To: =?utf-8?B?UmFmYcWCIE1pxYJlY2tp?= Cc: Arend van Spriel , lkml , "linux-wireless@vger.kernel.org" Subject: Re: [PATCH] brcmsmac: Fix build dep on LEDS_CLASS Message-ID: <20131118204003.GK24851@pd.tnic> References: <20131117133702.GA30840@pd.tnic> <5289359B.8090506@broadcom.com> <20131118133250.GH24851@pd.tnic> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20131118133250.GH24851@pd.tnic> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Mon, Nov 18, 2013 at 02:32:50PM +0100, Borislav Petkov wrote: > On Mon, Nov 18, 2013 at 12:58:58PM +0100, Rafa? Mi?ecki wrote: > > Borislav: I think I didn't get your original patch. > > Forget it, I'll send a better one later. Ok, let's try another one. I've done it with depends but we probably could select LEDS_CLASS in BRCMSMAC_LED as it is required functionality... --- From: Borislav Petkov Subject: [PATCH -v2] brcmsmac: Fix build dep on LEDS_CLASS When building randconfigs with CONFIG_BCMA_DRIVER_GPIO=y, I get drivers/built-in.o: In function `brcms_led_unregister': (.text+0x351aca): undefined reference to `led_classdev_unregister' drivers/built-in.o: In function `brcms_led_register': (.text+0x351c65): undefined reference to `led_classdev_register' during final linking stage because brcmsmac/led.c needs LEDS_CLASS for registering/deregistering the led device. Add a promptless Kconfig symbol which takes care of that dependency. Cc: "Rafa? Mi?ecki" Cc: Signed-off-by: Borislav Petkov --- drivers/net/wireless/brcm80211/Kconfig | 4 ++++ drivers/net/wireless/brcm80211/brcmsmac/Makefile | 2 +- drivers/net/wireless/brcm80211/brcmsmac/led.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig index b00a7e92225f..c9434b7c7b9b 100644 --- a/drivers/net/wireless/brcm80211/Kconfig +++ b/drivers/net/wireless/brcm80211/Kconfig @@ -16,6 +16,10 @@ config BRCMSMAC be available if you select BCMA_DRIVER_GPIO. If you choose to build a module, the driver will be called brcmsmac.ko. +config BRCMSMAC_LED + def_bool y + depends on BRCMSMAC && BCMA_DRIVER_GPIO && LEDS_CLASS + config BRCMFMAC tristate "Broadcom IEEE802.11n embedded FullMAC WLAN driver" depends on CFG80211 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/Makefile b/drivers/net/wireless/brcm80211/brcmsmac/Makefile index 32464acccd90..9ec2c8b2f26c 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile +++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile @@ -43,6 +43,6 @@ brcmsmac-y := \ brcms_trace_events.o \ debug.o -brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o +brcmsmac-$(CONFIG_BRCMSMAC_LED) += led.o obj-$(CONFIG_BRCMSMAC) += brcmsmac.o diff --git a/drivers/net/wireless/brcm80211/brcmsmac/led.h b/drivers/net/wireless/brcm80211/brcmsmac/led.h index 17a0b1f5dbcf..b914466e687b 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/led.h +++ b/drivers/net/wireless/brcm80211/brcmsmac/led.h @@ -22,7 +22,7 @@ struct brcms_led { bool active_low; }; -#ifdef CONFIG_BCMA_DRIVER_GPIO +#ifdef CONFIG_BRCMSMAC_LED void brcms_led_unregister(struct brcms_info *wl); int brcms_led_register(struct brcms_info *wl); #else