Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754954Ab1FTAFx (ORCPT ); Sun, 19 Jun 2011 20:05:53 -0400 Received: from sncsmrelay2.nai.com ([67.97.80.206]:63642 "EHLO sncsmrelay2.nai.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754870Ab1FTAFw (ORCPT ); Sun, 19 Jun 2011 20:05:52 -0400 Message-ID: <4DFE8ED1.3050007@snapgear.com> Date: Mon, 20 Jun 2011 10:05:37 +1000 From: Greg Ungerer User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110424 Thunderbird/3.1.10 MIME-Version: 1.0 To: Arnd Bergmann CC: , Shawn Guo , , , , Jason Liu , , "David S. Miller" Subject: Re: [PATCH 2/3] net/fec: add device tree support References: <1308410354-21387-1-git-send-email-shawn.guo@linaro.org> <1308410354-21387-3-git-send-email-shawn.guo@linaro.org> <4DFDDFF4.8000305@snapgear.com> <201106191411.32137.arnd@arndb.de> In-Reply-To: <201106191411.32137.arnd@arndb.de> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1893 Lines: 56 On 19/06/11 22:11, Arnd Bergmann wrote: > On Sunday 19 June 2011 13:39:32 Greg Ungerer wrote: >>> +#ifdef CONFIG_OF >>> +static const struct of_device_id fec_dt_ids[] = { >>> + { .compatible = "fsl,fec", .data =&fec_devtype[0], }, >>> + {}, >>> +}; >>> + >>> +static const struct of_device_id * >>> +fec_get_of_device_id(struct platform_device *pdev) >>> +{ >>> + return of_match_device(fec_dt_ids,&pdev->dev); >>> +} >>> +#else >>> +#define fec_dt_ids NULL >>> +static inline struct of_device_id * >>> +fec_get_of_device_id(struct platform_device *pdev) >>> +{ >>> + return NULL; >>> +} >>> +#endif >>> + >>> static unsigned char macaddr[ETH_ALEN]; >>> module_param_array(macaddr, byte, NULL, 0); >>> MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); >>> @@ -1363,6 +1385,11 @@ fec_probe(struct platform_device *pdev) >>> struct net_device *ndev; >>> int i, irq, ret = 0; >>> struct resource *r; >>> + const struct of_device_id *of_id; >>> + >>> + of_id = fec_get_of_device_id(pdev); >> >> fec_get_of_device_id() is defined inside of "#ifdef CONFIG_OF". This >> use of it will break compilation when this is not defined. >> > > > Why? Note the #else path defining an empty function. Sorry, missed that :-) Regards Greg ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close FAX: +61 7 3217 5323 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com -- 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/