From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Wolfram Sang <wsa@the-dreams•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Mika Westerberg <mika.westerberg@linux•intel.com>
Subject: linux-next: build failure after merge of the i2c tree
Date: Wed, 16 Dec 2015 15:48:13 +1100 [thread overview]
Message-ID: <20151216154813.2566a655@canb.auug.org.au> (raw)
Hi Wolfram,
After merging the i2c tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:
drivers/i2c/busses/i2c-ibm_iic.c:102:15: error: redefinition of 'struct i2c_timings'
static struct i2c_timings {
^
In file included from drivers/i2c/busses/i2c-ibm_iic.c:42:0:
include/linux/i2c.h:424:8: note: originally defined here
struct i2c_timings {
^
Caused by commit
e1dba01ca620 ("i2c: add generic routine to parse DT for timing information")
I have applied the following patch for today:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 16 Dec 2015 15:34:10 +1100
Subject: [PATCH] ii2c: rename i2c_timings struct due to clash with generic version
Fixes: e1dba01ca620 ("i2c: add generic routine to parse DT for timing information")
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/i2c/busses/i2c-ibm_iic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index ab492301581a..51154fada1df 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -99,7 +99,7 @@ static void dump_iic_regs(const char* header, struct ibm_iic_private* dev)
#endif
/* Bus timings (in ns) for bit-banging */
-static struct i2c_timings {
+static struct ibm_i2c_timings {
unsigned int hd_sta;
unsigned int su_sto;
unsigned int low;
@@ -241,7 +241,7 @@ static int iic_dc_wait(volatile struct iic_regs __iomem *iic, u8 mask)
static int iic_smbus_quick(struct ibm_iic_private* dev, const struct i2c_msg* p)
{
volatile struct iic_regs __iomem *iic = dev->vaddr;
- const struct i2c_timings* t = &timings[dev->fast_mode ? 1 : 0];
+ const struct ibm_i2c_timings* t = &timings[dev->fast_mode ? 1 : 0];
u8 mask, v, sda;
int i, res;
--
2.6.2
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2015-12-16 4:48 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-16 4:48 Stephen Rothwell [this message]
2016-01-04 23:55 ` linux-next: build failure after merge of the i2c tree Stephen Rothwell
2016-01-05 1:04 ` Wolfram Sang
-- strict thread matches above, loose matches on Subject: below --
2022-10-04 0:20 Stephen Rothwell
2022-10-04 6:22 ` Uwe Kleine-König
2022-10-05 23:05 ` Stephen Rothwell
2021-06-01 0:32 Stephen Rothwell
2021-06-01 8:55 ` Wolfram Sang
2021-06-01 9:09 ` Hsin-Yi Wang
2021-06-01 9:21 ` Wolfram Sang
2017-11-28 0:02 Stephen Rothwell
2017-11-28 9:53 ` Wolfram Sang
2017-06-26 1:09 Stephen Rothwell
2017-06-26 2:04 ` Shawn Guo
2015-08-25 0:51 Stephen Rothwell
2015-08-26 0:01 ` Dmitry Torokhov
2015-01-16 2:22 Stephen Rothwell
2015-01-16 7:16 ` Pantelis Antoniou
2014-11-24 9:16 Stephen Rothwell
2014-11-24 9:24 ` Wolfram Sang
2013-11-17 23:29 Stephen Rothwell
2011-05-19 3:27 Stephen Rothwell
2011-05-19 9:06 ` Jean Delvare
2010-06-21 2:03 Stephen Rothwell
2010-06-21 5:57 ` Jean Delvare
2010-06-21 7:09 ` Stephen Rothwell
2010-03-01 2:12 Stephen Rothwell
2010-03-01 10:43 ` Jean Delvare
2010-03-02 0:31 ` Stephen Rothwell
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=20151216154813.2566a655@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mika.westerberg@linux$(echo .)intel.com \
--cc=wsa@the-dreams$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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