From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756732AbbDOUF4 (ORCPT ); Wed, 15 Apr 2015 16:05:56 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:37715 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755074AbbDOUFp (ORCPT ); Wed, 15 Apr 2015 16:05:45 -0400 From: Guenter Roeck To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [RFC PATCH] bgmac: Fix build error seen if BCM47XX is not configured Date: Wed, 15 Apr 2015 13:05:38 -0700 Message-Id: <1429128338-28549-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A020206.552EC499.0182,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-CTCH-Score: 0.000 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 3 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 0 X-CTCH-SenderID-TotalConfirmed: 0 X-CTCH-SenderID-TotalBulk: 0 X-CTCH-SenderID-TotalVirus: 0 X-CTCH-SenderID-TotalRecipients: 0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: mailgid no entry from get_relayhosts_entry X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org arm:allmodconfig fails to build as follows since ARCH_BCM_5301X is configured but not BCM47XX. drivers/net/ethernet/broadcom/bgmac.c: In function 'bgmac_probe': drivers/net/ethernet/broadcom/bgmac.c:1643:2: error: implicit declaration of function 'bcm47xx_nvram_getenv' Fixes: fc300dc3733f ("bgmac: allow enabling on ARCH_BCM_5301X") Cc: Rafał Miłecki Signed-off-by: Guenter Roeck --- Seen in today's upstream kernel. I don't like this fix too much (I think it is quite kludgy), so I marked it RFC (and please don't beat the messenger ;-). drivers/net/ethernet/broadcom/bgmac.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index 5cb93d1f50a4..dcf27a7c1836 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -17,8 +17,21 @@ #include #include #include + +#ifdef CONFIG_BCM47XX #include +static int __bcm47xx_nvram_getenv(const char *name, char *val, size_t len) +{ + return bcm47xx_nvram_getenv(name, val, len); +} +#else +static int __bcm47xx_nvram_getenv(const char *name, char *val, size_t len) +{ + return -ENOENT; +} +#endif + static const struct bcma_device_id bgmac_bcma_tbl[] = { BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS), BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS), @@ -1070,7 +1083,7 @@ static void bgmac_chip_reset(struct bgmac *bgmac) BGMAC_CHIPCTL_1_IF_TYPE_MII; char buf[4]; - if (bcm47xx_nvram_getenv("et_swtype", buf, sizeof(buf)) > 0) { + if (__bcm47xx_nvram_getenv("et_swtype", buf, sizeof(buf)) > 0) { if (kstrtou8(buf, 0, &et_swtype)) bgmac_err(bgmac, "Failed to parse et_swtype (%s)\n", buf); @@ -1635,7 +1648,7 @@ static int bgmac_probe(struct bcma_device *core) } bgmac->int_mask = BGMAC_IS_ERRMASK | BGMAC_IS_RX | BGMAC_IS_TX_MASK; - if (bcm47xx_nvram_getenv("et0_no_txint", NULL, 0) == 0) + if (__bcm47xx_nvram_getenv("et0_no_txint", NULL, 0) == 0) bgmac->int_mask &= ~BGMAC_IS_TX_MASK; /* TODO: reset the external phy. Specs are needed */ -- 2.1.0