From patchwork Wed Mar 4 11:14:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 5935481 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 19C8A9F318 for ; Wed, 4 Mar 2015 11:14:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 42AF420260 for ; Wed, 4 Mar 2015 11:14:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B6472015E for ; Wed, 4 Mar 2015 11:14:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932898AbbCDLOy (ORCPT ); Wed, 4 Mar 2015 06:14:54 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:41540 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755702AbbCDLOx (ORCPT ); Wed, 4 Mar 2015 06:14:53 -0500 Received: by widex7 with SMTP id ex7so29631784wid.0 for ; Wed, 04 Mar 2015 03:14:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=1dVmgWwe2faWAQYzoh9JEKMyYGRz2Si3oqUYhekhJAw=; b=DNQXEQ2HZy1ymLoTd0HmfLBP2OMqgVYRNcBSUDuamtJfSnVdglKJ8/WZaDyGgVHojq 68FvcvkjK8yoh1gAgsvAkItTQHr5VfUksNlzEldkWn6M7faTWl9CZ9G3TijNa3z/1Snm E/tJ6l5BH+Hb6+EYg/Apxocw77w0murgRgKp9nrSU3ul/IufoUGZ62piNCOo4Jm9uxb8 9FgbKtNUUZudfdaCRSfx9559HwRtjdV4928AHahGAVo6f3CMhF1o1wVkKgxRY+QSvDRW lVKcNwG26yS23anBx62JQINEvorj3l5JR+czSqUmohhONwAQVt7BKddpsdHbxmUipKBQ 1tNQ== X-Received: by 10.194.19.166 with SMTP id g6mr6972772wje.150.1425467692343; Wed, 04 Mar 2015 03:14:52 -0800 (PST) Received: from linux-tdhb.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by mx.google.com with ESMTPSA id vq9sm3889710wjc.6.2015.03.04.03.14.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2015 03:14:51 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo , linux-wireless@vger.kernel.org Cc: Hauke Mehrtens , Arnd Bergmann , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH next] bcma: make bcma_host_pci_(up|down) calls safe for every config Date: Wed, 4 Mar 2015 12:14:41 +0100 Message-Id: <1425467681-15988-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 We were providing declarations but actual code was compiled only with CONFIG_BCMA_HOST_PCI set. This could result in: ERROR: "bcma_host_pci_down" [drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko] undefined! ERROR: "bcma_host_pci_up" [drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko] undefined! ERROR: "bcma_host_pci_down" [drivers/net/wireless/b43/b43.ko] undefined! ERROR: "bcma_host_pci_up" [drivers/net/wireless/b43/b43.ko] undefined! Reported-by: Arnd Bergmann Signed-off-by: Rafa? Mi?ecki --- include/linux/bcma/bcma.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h index 037620b..44057b4 100644 --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h @@ -434,8 +434,17 @@ static inline struct bcma_device *bcma_find_core(struct bcma_bus *bus, return bcma_find_core_unit(bus, coreid, 0); } +#ifdef CONFIG_BCMA_HOST_PCI extern void bcma_host_pci_up(struct bcma_bus *bus); extern void bcma_host_pci_down(struct bcma_bus *bus); +#else +static inline void bcma_host_pci_up(struct bcma_bus *bus) +{ +} +static inline void bcma_host_pci_down(struct bcma_bus *bus) +{ +} +#endif extern bool bcma_core_is_enabled(struct bcma_device *core); extern void bcma_core_disable(struct bcma_device *core, u32 flags);