Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759346Ab3DATOQ (ORCPT ); Mon, 1 Apr 2013 15:14:16 -0400 Received: from mail-ve0-f173.google.com ([209.85.128.173]:60836 "EHLO mail-ve0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759311Ab3DATOO (ORCPT ); Mon, 1 Apr 2013 15:14:14 -0400 Message-ID: <5159DC82.3050804@gmail.com> Date: Mon, 01 Apr 2013 14:14:10 -0500 From: Rob Herring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Guenter Roeck CC: linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, netdev@vger.kernel.org, "David S. Miller" , Rob Herring , David Daney Subject: Re: [PATCH] of_net.h: Provide dummy functions if OF_NET is not configured References: <1364840349-10696-1-git-send-email-linux@roeck-us.net> <5159D588.5070603@gmail.com> <20130401190100.GA1042@roeck-us.net> In-Reply-To: <20130401190100.GA1042@roeck-us.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2396 Lines: 72 On 04/01/2013 02:01 PM, Guenter Roeck wrote: > On Mon, Apr 01, 2013 at 01:44:24PM -0500, Rob Herring wrote: >> On 04/01/2013 01:19 PM, Guenter Roeck wrote: >>> of_get_mac_address() and of_get_phy_mode() are only provided if OF_NET >>> is configured. While most callers check for the define, not all do, and those >>> who do require #ifdef around the code. For those who don't, the missing check >>> can result in errors such as >> >> How about removing the ifdef from those callers? >> > That would be the next step, after/if this one is accepted. > If not, it doesn't make sense to waste my time. Assuming that is done: Acked-by: Rob Herring Presumably with the follow-on patches, this can go in thru the net tree. Rob > Thanks, > Guenter > >> Rob >> >>> >>> arch/powerpc/sysdev/tsi108_dev.c:107:3: error: implicit declaration of >>> function 'of_get_mac_address' [-Werror=implicit-function-declaration] >>> arch/powerpc/sysdev/mv64x60_dev.c:253:2: error: implicit declaration of >>> function 'of_get_mac_address' [-Werror=implicit-function-declaration] >>> >>> Provide dummy function declarations if OF_NET is not configured. This is safe >>> because all callers do check the return values. If desired, at least some of >>> the #ifdefs in the code can subsequently be removed. >>> >>> Cc: David Daney >>> Signed-off-by: Guenter Roeck >>> --- >>> include/linux/of_net.h | 10 ++++++++++ >>> 1 file changed, 10 insertions(+) >>> >>> diff --git a/include/linux/of_net.h b/include/linux/of_net.h >>> index f474641..61bf53b 100644 >>> --- a/include/linux/of_net.h >>> +++ b/include/linux/of_net.h >>> @@ -11,6 +11,16 @@ >>> #include >>> extern const int of_get_phy_mode(struct device_node *np); >>> extern const void *of_get_mac_address(struct device_node *np); >>> +#else >>> +static inline const int of_get_phy_mode(struct device_node *np) >>> +{ >>> + return -ENODEV; >>> +} >>> + >>> +static inline const void *of_get_mac_address(struct device_node *np) >>> +{ >>> + return NULL; >>> +} >>> #endif >>> >>> #endif /* __LINUX_OF_NET_H */ >>> >> >> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/