From patchwork Sun Nov 17 23:02:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 3194961 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 380609F3A0 for ; Sun, 17 Nov 2013 23:03:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B354206B0 for ; Sun, 17 Nov 2013 23:03:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 66C4B206AA for ; Sun, 17 Nov 2013 23:03:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752048Ab3KQXCy (ORCPT ); Sun, 17 Nov 2013 18:02:54 -0500 Received: from mail.skyhub.de ([78.46.96.112]:36755 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751374Ab3KQXCx (ORCPT ); Sun, 17 Nov 2013 18:02:53 -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=1384729372; bh=A4MYMZlVhOCfx6kLauWHipYoHVD61zsI4stvdDebTbM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=Nf4Obw5m0O2DG4JuIpbwe6f5sfNKKE1Wct6bvP h6n9U7f9YAORoyheF2MvH0KB1UWloay1AHdHldSeQaM/LnN66uRMuKhZta9HxERkR1y UCB+ucrSe/QGklncQgX4UvUnUlpfhLQfZXE7Zj5bPctO7QO1cbJal37ZZtuyVEgGW8= 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 PrcUJSkQ0iFC; Mon, 18 Nov 2013 00:02:51 +0100 (CET) Received: from liondog.tnic (p54B7F055.dip0.t-ipconnect.de [84.183.240.85]) (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 9A62E1DA258; Mon, 18 Nov 2013 00:02:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1384729371; bh=A4MYMZlVhOCfx6kLauWHipYoHVD61zsI4stvdDebTbM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=gey941GZu1VBTPCWID4d1uEekdJXpzchTIuRPO PeaFesBhdNpRqFhZYdEfDISb/cTQJw4JIkdtxvTLr4TKGygO0saWlJWu5wIW9jJ8uYl Cet1BxwuvaVquL/ctIgaZn07gD+xrXWy860baFbAcd0fC80+vWatS58OJ0nN1u2ZxM= Received: by liondog.tnic (Postfix, from userid 1000) id 776F3107160; Mon, 18 Nov 2013 00:02:20 +0100 (CET) Date: Mon, 18 Nov 2013 00:02:20 +0100 From: Borislav Petkov To: Arend van Spriel Cc: lkml , =?utf-8?B?UmFmYcWCIE1pxYJlY2tp?= , linux-wireless@vger.kernel.org Subject: Re: [PATCH] brcmsmac: Fix build dep on LEDS_CLASS Message-ID: <20131117230220.GS27323@pd.tnic> References: <20131117133702.GA30840@pd.tnic> <5289359B.8090506@broadcom.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5289359B.8090506@broadcom.com> 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=ham 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 Sun, Nov 17, 2013 at 10:31:07PM +0100, Arend van Spriel wrote: > Wouldn't it be better to fix it in brcmsmac. You're right, BCMA_DRIVER_GPIO doesn't need LEDS_CLASS. So, the only solution I can think of right now is below, maybe adding a hidden config symbol CONFIG_BRCMSMAC_LEDS which depends on BCMA_DRIVER_GPIO and LEDS_CLASS and then doing: brcmsmac-$(CONFIG_BRCMSMAC_LEDS) += led.o would be cleaner though. I could try that out tomorrow. diff --git a/drivers/net/wireless/brcm80211/brcmsmac/Makefile b/drivers/net/wireless/brcm80211/brcmsmac/Makefile index 32464acccd90..8fd44d168cd5 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile +++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile @@ -43,6 +43,8 @@ brcmsmac-y := \ brcms_trace_events.o \ debug.o +ifdef CONFIG_LEDS_CLASS brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o +endif 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..23b4b688d9f7 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 +#if defined(CONFIG_BCMA_DRIVER_GPIO) && defined(CONFIG_LEDS_CLASS) void brcms_led_unregister(struct brcms_info *wl); int brcms_led_register(struct brcms_info *wl); #else