From: mathieu.poirier@linaro.org (mathieu.poirier at linaro.org)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/9] ARM: omap2+: fix building without i2c
Date: Fri, 23 Mar 2012 11:13:51 -0600 [thread overview]
Message-ID: <1332522836-29517-5-git-send-email-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <1332522836-29517-1-git-send-email-mathieu.poirier@linaro.org>
From: Arnd Bergmann <arnd@arndb.de>
A trivial typo causes build breakage when I2C is disabled
and omap_i2c_reset is set to NULL on OMAP:
omap_hwmod_44xx_data.c:2287:11: error: lvalue required as unary '&' operand
Removing the '&' character solves this.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Avinash.H.M <avinashhm@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index a5409ce..d74c76f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -1038,7 +1038,7 @@ static struct omap_hwmod_class i2c_class = {
.name = "i2c",
.sysc = &i2c_sysc,
.rev = OMAP_I2C_IP_VERSION_1,
- .reset = &omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_i2c_dev_attr i2c_dev_attr = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index c4f56cb..69c91b3 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -1088,7 +1088,7 @@ static struct omap_hwmod_class i2c_class = {
.name = "i2c",
.sysc = &i2c_sysc,
.rev = OMAP_I2C_IP_VERSION_1,
- .reset = &omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_i2c_dev_attr i2c_dev_attr = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 3c8dd92..d8eb79f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -1367,7 +1367,7 @@ static struct omap_hwmod_class i2c_class = {
.name = "i2c",
.sysc = &i2c_sysc,
.rev = OMAP_I2C_IP_VERSION_1,
- .reset = &omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_hwmod_dma_info omap3xxx_dss_sdma_chs[] = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index ef0524c..9adf749 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -2258,7 +2258,7 @@ static struct omap_hwmod_class omap44xx_i2c_hwmod_class = {
.name = "i2c",
.sysc = &omap44xx_i2c_sysc,
.rev = OMAP_I2C_IP_VERSION_2,
- .reset = &omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_i2c_dev_attr i2c_dev_attr = {
--
1.7.5.4
next prev parent reply other threads:[~2012-03-23 17:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-23 17:13 [PATCH 0/9] omap randconfig fixes for v3.3 mathieu.poirier at linaro.org
2012-03-23 17:13 ` [PATCH 1/9] arm/omap: enable building omap2 without omap2420/2430 mathieu.poirier at linaro.org
2012-03-23 17:13 ` [PATCH 2/9] omap: fix visibility of omap2_mbox_iva_priv mathieu.poirier at linaro.org
2012-03-23 18:30 ` Tony Lindgren
2012-03-23 17:13 ` [PATCH 3/9] ARM: omap2/n8x0: work around modular omap mmc mathieu.poirier at linaro.org
2012-03-23 17:29 ` Tony Lindgren
2012-03-24 9:23 ` Russell King - ARM Linux
2012-03-23 17:13 ` mathieu.poirier at linaro.org [this message]
2012-03-23 17:22 ` [PATCH 4/9] ARM: omap2+: fix building without i2c Tony Lindgren
2012-03-23 17:13 ` [PATCH 5/9] tty/serial/omap: console can only be built-in mathieu.poirier at linaro.org
2012-03-23 18:33 ` Tony Lindgren
2012-03-23 17:13 ` [PATCH 6/9] omap2: select twl4030 support on boards that need it mathieu.poirier at linaro.org
2012-03-23 17:13 ` [PATCH 7/9] omap2plus: ensure that one of omap2/3/4 is selected mathieu.poirier at linaro.org
2012-03-23 17:28 ` Tony Lindgren
2012-03-23 17:38 ` Arnd Bergmann
2012-03-23 18:14 ` Tony Lindgren
2012-03-23 17:13 ` [PATCH 8/9] arm: OMAP depends on MMU mathieu.poirier at linaro.org
2012-03-23 17:13 ` [PATCH 9/9] ARM: omap: select CPU_FREQ_TABLE where needed mathieu.poirier at linaro.org
2012-03-23 18:27 ` Tony Lindgren
2012-03-26 23:09 ` Kevin Hilman
2012-03-29 17:28 ` [PATCH 0/9] omap randconfig fixes for v3.3 Tony Lindgren
2012-05-07 19:07 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332522836-29517-5-git-send-email-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).