From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752534AbdDLEmI (ORCPT ); Wed, 12 Apr 2017 00:42:08 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:34582 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899AbdDLEmD (ORCPT ); Wed, 12 Apr 2017 00:42:03 -0400 From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, Florian Fainelli , Lee Jones , Nicolas Ferre , Rob Herring , Frank Rowand , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v2 2/3] net: macb: Remove CONFIG_OF around DT match table Date: Tue, 11 Apr 2017 21:41:55 -0700 Message-Id: <20170412044156.17351-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170412044156.17351-1-f.fainelli@gmail.com> References: <20170412044156.17351-1-f.fainelli@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A subsequent patch is going to make of_match_node() an inline stub when CONFIG_OF is disabled, which will let the compiler eliminate unused variables. In order not to clutter the code more, remove the CONFIG_OF #ifdef such that macb_dt_ids and what it references are always defined. Signed-off-by: Florian Fainelli --- drivers/net/ethernet/cadence/macb.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 30606b11b128..01016e9525ee 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2811,7 +2811,6 @@ static int macb_init(struct platform_device *pdev) return 0; } -#if defined(CONFIG_OF) /* 1518 rounded up */ #define AT91ETHER_MAX_RBUFF_SZ 0x600 /* max number of receive buffers */ @@ -3215,7 +3214,6 @@ static const struct of_device_id macb_dt_ids[] = { { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, macb_dt_ids); -#endif /* CONFIG_OF */ static const struct macb_config default_gem_config = { .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO, -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: [PATCH v2 2/3] net: macb: Remove CONFIG_OF around DT match table Date: Tue, 11 Apr 2017 21:41:55 -0700 Message-ID: <20170412044156.17351-3-f.fainelli@gmail.com> References: <20170412044156.17351-1-f.fainelli@gmail.com> Return-path: In-Reply-To: <20170412044156.17351-1-f.fainelli@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, Florian Fainelli , Lee Jones , Nicolas Ferre , Rob Herring , Frank Rowand , "open list:NETWORKING DRIVERS" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE" List-Id: devicetree@vger.kernel.org A subsequent patch is going to make of_match_node() an inline stub when CONFIG_OF is disabled, which will let the compiler eliminate unused variables. In order not to clutter the code more, remove the CONFIG_OF #ifdef such that macb_dt_ids and what it references are always defined. Signed-off-by: Florian Fainelli --- drivers/net/ethernet/cadence/macb.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 30606b11b128..01016e9525ee 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2811,7 +2811,6 @@ static int macb_init(struct platform_device *pdev) return 0; } -#if defined(CONFIG_OF) /* 1518 rounded up */ #define AT91ETHER_MAX_RBUFF_SZ 0x600 /* max number of receive buffers */ @@ -3215,7 +3214,6 @@ static const struct of_device_id macb_dt_ids[] = { { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, macb_dt_ids); -#endif /* CONFIG_OF */ static const struct macb_config default_gem_config = { .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO, -- 2.9.3