From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Walmsley Subject: [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF Date: Sun, 22 Jan 2012 04:02:33 -0700 Message-ID: <20120122110232.6508.68451.stgit@dusk> References: <20120122105942.6508.82335.stgit@dusk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from utopia.booyaka.com ([72.9.107.138]:46341 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751825Ab2AVLDV (ORCPT ); Sun, 22 Jan 2012 06:03:21 -0500 In-Reply-To: <20120122105942.6508.82335.stgit@dusk> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Grant Likely , Kevin Hilman , Tony Lindgren , Benoit Cousson , Rob Herring Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT support for i2c controller") breaks compilation when CONFIG_OF is not defined: CC drivers/i2c/busses/i2c-omap.o drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe': drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function) drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in Fix this by avoiding of_*() functions when !CONFIG_OF. Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Rob Herring Cc: Grant Likely Cc: Kevin Hilman Cc: Tony Lindgren --- drivers/i2c/busses/i2c-omap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index f713eac..1008e96 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -989,7 +989,7 @@ omap_i2c_probe(struct platform_device *pdev) struct resource *mem, *irq, *ioarea; struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data; struct device_node *node = pdev->dev.of_node; - const struct of_device_id *match; + const struct of_device_id *match = NULL; irq_handler_t isr; int r; @@ -1018,7 +1018,9 @@ omap_i2c_probe(struct platform_device *pdev) goto err_release_region; } +#ifdef CONFIG_OF match = of_match_device(omap_i2c_of_match, &pdev->dev); +#endif if (match) { u32 freq = 100000; /* default to 100000 Hz */