From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752850AbdDLEmr (ORCPT ); Wed, 12 Apr 2017 00:42:47 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:33557 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751115AbdDLEmC (ORCPT ); Wed, 12 Apr 2017 00:42:02 -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 1/3] mfd: max8998: Remove CONFIG_OF around max8998_dt_match Date: Tue, 11 Apr 2017 21:41:54 -0700 Message-Id: <20170412044156.17351-2-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 properly take care of having the compiler eliminate the variable. To avoid more #ifdef/#else, just always make the match table available. Signed-off-by: Florian Fainelli --- drivers/mfd/max8998.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c index 4c33b8063bc3..372f681ec1bb 100644 --- a/drivers/mfd/max8998.c +++ b/drivers/mfd/max8998.c @@ -129,14 +129,12 @@ int max8998_update_reg(struct i2c_client *i2c, u8 reg, u8 val, u8 mask) } EXPORT_SYMBOL(max8998_update_reg); -#ifdef CONFIG_OF static const struct of_device_id max8998_dt_match[] = { { .compatible = "maxim,max8998", .data = (void *)TYPE_MAX8998 }, { .compatible = "national,lp3974", .data = (void *)TYPE_LP3974 }, { .compatible = "ti,lp3974", .data = (void *)TYPE_LP3974 }, {}, }; -#endif /* * Only the common platform data elements for max8998 are parsed here from the -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: [PATCH v2 1/3] mfd: max8998: Remove CONFIG_OF around max8998_dt_match Date: Tue, 11 Apr 2017 21:41:54 -0700 Message-ID: <20170412044156.17351-2-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 properly take care of having the compiler eliminate the variable. To avoid more #ifdef/#else, just always make the match table available. Signed-off-by: Florian Fainelli --- drivers/mfd/max8998.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c index 4c33b8063bc3..372f681ec1bb 100644 --- a/drivers/mfd/max8998.c +++ b/drivers/mfd/max8998.c @@ -129,14 +129,12 @@ int max8998_update_reg(struct i2c_client *i2c, u8 reg, u8 val, u8 mask) } EXPORT_SYMBOL(max8998_update_reg); -#ifdef CONFIG_OF static const struct of_device_id max8998_dt_match[] = { { .compatible = "maxim,max8998", .data = (void *)TYPE_MAX8998 }, { .compatible = "national,lp3974", .data = (void *)TYPE_LP3974 }, { .compatible = "ti,lp3974", .data = (void *)TYPE_LP3974 }, {}, }; -#endif /* * Only the common platform data elements for max8998 are parsed here from the -- 2.9.3