From patchwork Mon Oct 1 12:21:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 188284 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E78D62C0100 for ; Mon, 1 Oct 2012 22:28:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752764Ab2JAM1e (ORCPT ); Mon, 1 Oct 2012 08:27:34 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:64877 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752635Ab2JAM1c (ORCPT ); Mon, 1 Oct 2012 08:27:32 -0400 Received: by mail-wi0-f172.google.com with SMTP id hq12so2664823wib.1 for ; Mon, 01 Oct 2012 05:27:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=WpxQtqlhiiiXKKOsxBVfybJmYA5OL+BWfylugWDfhZc=; b=k08exwvOTLvYPVSMEzS+OM2KiISi3hTvNmboFi6tzHGYS666yp4aCmLaO9lLggF+6B r8dmGdesS125GhauFCOhU6i5IegPlvHwns6ifNNlRzrbO3n1tabagOWTCQ5GVBVl4jJX 0MOXD6cRiIwDVayI5TgGRLa3E1CXMxXMtr9iFFx3EM9uet8ZCQkD5ikEgt8PZNcRQBuS UuqK30FxZYJwcP1z4AtreDCIRSlVM1c2kFYOEPwXICPdhpHs26nDsvylIciVETDwycEd y3maduoh10YmPRDTJ8drryXUc0fq3h34z3MvloYNUiEUdDWFgDpIKo0nPm21eZXlg235 QPKw== Received: by 10.180.94.226 with SMTP id df2mr14376964wib.11.1349094451678; Mon, 01 Oct 2012 05:27:31 -0700 (PDT) Received: from compilator-1.substantiel.local ([78.228.214.160]) by mx.google.com with ESMTPS id q7sm18395644wiy.11.2012.10.01.05.27.29 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 05:27:30 -0700 (PDT) From: Anisse Astier To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Paul Gortmaker , Michal Marek , Linus Torvalds , Michael Chan , Matt Carlson , Anisse Astier Subject: [PATCH 2/2] tg3: fix build-time dependency with IS_DEPENDENCY_SATISFIED() Date: Mon, 1 Oct 2012 14:21:20 +0200 Message-Id: <1349094080-769-2-git-send-email-anisse@astier.eu> X-Mailer: git-send-email 1.7.10.3 In-Reply-To: <1349094080-769-1-git-send-email-anisse@astier.eu> References: <1349094080-769-1-git-send-email-anisse@astier.eu> X-Gm-Message-State: ALoCoQn+UTzSYlmCzhWvYboQCz1RCUNAZ+TJFil2eQojg6bBJcXNsqvwwbWKhGycBcZ0C58YUXkg Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When CONFIG_TIGON3=y and CONFIG_HWMON=y, we will get this error: LD init/built-in.o drivers/built-in.o: In function `tg3_hwmon_open': tg3.c:(.text+0xc1d12): undefined reference to `hwmon_device_register' drivers/built-in.o: In function `tg3_close': tg3.c:(.text+0xc2e7f): undefined reference to `hwmon_device_unregister' make: *** [vmlinux] Error 1 Use the new IS_DEPENDENCY_SATISFIED() facility to solve this problem. Signed-off-by: Anisse Astier --- drivers/net/ethernet/broadcom/tg3.c | 8 ++++---- drivers/net/ethernet/broadcom/tg3.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index bf906c5..cc81a59 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -44,7 +44,7 @@ #include #include #include -#if IS_ENABLED(CONFIG_HWMON) +#if IS_DEPENDENCY_SATISFIED(CONFIG_TIGON3, CONFIG_HWMON) #include #include #endif @@ -9517,7 +9517,7 @@ static int tg3_init_hw(struct tg3 *tp, int reset_phy) return tg3_reset_hw(tp, reset_phy); } -#if IS_ENABLED(CONFIG_HWMON) +#if IS_DEPENDENCY_SATISFIED(CONFIG_TIGON3, CONFIG_HWMON) static void tg3_sd_scan_scratchpad(struct tg3 *tp, struct tg3_ocir *ocir) { int i; @@ -9574,7 +9574,7 @@ static const struct attribute_group tg3_group = { static void tg3_hwmon_close(struct tg3 *tp) { -#if IS_ENABLED(CONFIG_HWMON) +#if IS_DEPENDENCY_SATISFIED(CONFIG_TIGON3, CONFIG_HWMON) if (tp->hwmon_dev) { hwmon_device_unregister(tp->hwmon_dev); tp->hwmon_dev = NULL; @@ -9585,7 +9585,7 @@ static void tg3_hwmon_close(struct tg3 *tp) static void tg3_hwmon_open(struct tg3 *tp) { -#if IS_ENABLED(CONFIG_HWMON) +#if IS_DEPENDENCY_SATISFIED(CONFIG_TIGON3, CONFIG_HWMON) int i, err; u32 size = 0; struct pci_dev *pdev = tp->pdev; diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h index 6d52cb2..867dae1 100644 --- a/drivers/net/ethernet/broadcom/tg3.h +++ b/drivers/net/ethernet/broadcom/tg3.h @@ -3252,7 +3252,7 @@ struct tg3 { const struct firmware *fw; u32 fw_len; /* includes BSS */ -#if IS_ENABLED(CONFIG_HWMON) +#if IS_DEPENDENCY_SATISFIED(CONFIG_TIGON3, CONFIG_HWMON) struct device *hwmon_dev; #endif };