linux-next: build failure after merge of the i2c tree

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3567 bytes --]

Hi all,

After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
   97 | static void pm_suspend(struct drm_i915_private *i915)
      |             ^~~~~~~~~~
In file included from include/linux/regulator/consumer.h:35,
                 from include/linux/i2c.h:18,
                 from drivers/gpu/drm/i915/i915_drv.h:39,
                 from drivers/gpu/drm/i915/gt/intel_context.h:14,
                 from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
                 from drivers/gpu/drm/i915/i915_gem.c:44:
include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
  331 | extern int pm_suspend(suspend_state_t state);
      |            ^~~~~~~~~~

Caused by commit

  5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")

interacting with commit

  3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")

from Linus' tree (v4.20-rc1)

I have added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Jun 2021 10:25:49 +1000
Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/selftests/i915_gem.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c
index dc394fb7ccfa..5d674708b047 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem.c
@@ -87,14 +87,14 @@ static void simulate_hibernate(struct drm_i915_private *i915)
 	intel_runtime_pm_put(&i915->runtime_pm, wakeref);
 }
 
-static int pm_prepare(struct drm_i915_private *i915)
+static int test_pm_prepare(struct drm_i915_private *i915)
 {
 	i915_gem_suspend(i915);
 
 	return 0;
 }
 
-static void pm_suspend(struct drm_i915_private *i915)
+static void test_pm_suspend(struct drm_i915_private *i915)
 {
 	intel_wakeref_t wakeref;
 
@@ -104,7 +104,7 @@ static void pm_suspend(struct drm_i915_private *i915)
 	}
 }
 
-static void pm_hibernate(struct drm_i915_private *i915)
+static void test_pm_hibernate(struct drm_i915_private *i915)
 {
 	intel_wakeref_t wakeref;
 
@@ -116,7 +116,7 @@ static void pm_hibernate(struct drm_i915_private *i915)
 	}
 }
 
-static void pm_resume(struct drm_i915_private *i915)
+static void test_pm_resume(struct drm_i915_private *i915)
 {
 	intel_wakeref_t wakeref;
 
@@ -148,16 +148,16 @@ static int igt_gem_suspend(void *arg)
 	if (err)
 		goto out;
 
-	err = pm_prepare(i915);
+	err = test_pm_prepare(i915);
 	if (err)
 		goto out;
 
-	pm_suspend(i915);
+	test_pm_suspend(i915);
 
 	/* Here be dragons! Note that with S3RST any S3 may become S4! */
 	simulate_hibernate(i915);
 
-	pm_resume(i915);
+	test_pm_resume(i915);
 
 	err = switch_to_context(ctx);
 out:
@@ -183,16 +183,16 @@ static int igt_gem_hibernate(void *arg)
 	if (err)
 		goto out;
 
-	err = pm_prepare(i915);
+	err = test_pm_prepare(i915);
 	if (err)
 		goto out;
 
-	pm_hibernate(i915);
+	test_pm_hibernate(i915);
 
 	/* Here be dragons! */
 	simulate_hibernate(i915);
 
-	pm_resume(i915);
+	test_pm_resume(i915);
 
 	err = switch_to_context(ctx);
 out:
-- 
2.30.2

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 1716 bytes --]

Hi Stephen,

> After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
> drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
>    97 | static void pm_suspend(struct drm_i915_private *i915)
>       |             ^~~~~~~~~~
> In file included from include/linux/regulator/consumer.h:35,
>                  from include/linux/i2c.h:18,
>                  from drivers/gpu/drm/i915/i915_drv.h:39,
>                  from drivers/gpu/drm/i915/gt/intel_context.h:14,
>                  from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
>                  from drivers/gpu/drm/i915/i915_gem.c:44:
> include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
>   331 | extern int pm_suspend(suspend_state_t state);
>       |            ^~~~~~~~~~
> 
> Caused by commit
> 
>   5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
> 
> interacting with commit
> 
>   3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
> 
> from Linus' tree (v4.20-rc1)

Thank you very much for taking care of this!


> I have added the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 1 Jun 2021 10:25:49 +1000
> Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Looks like the proper solution to me. I think this should be added to
the i915 tree. D'accord everyone?

Reviewed-by: Wolfram Sang <wsa@kernel.org>

Kind regards,

   Wolfram


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Hsin-Yi Wang]

On Tue, Jun 1, 2021 at 4:55 PM Wolfram Sang <wsa@the-dreams.de> wrote:
>
> Hi Stephen,
>
> > After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > In file included from drivers/gpu/drm/i915/i915_gem.c:1250:
> > drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend'
> >    97 | static void pm_suspend(struct drm_i915_private *i915)
> >       |             ^~~~~~~~~~
> > In file included from include/linux/regulator/consumer.h:35,
> >                  from include/linux/i2c.h:18,
> >                  from drivers/gpu/drm/i915/i915_drv.h:39,
> >                  from drivers/gpu/drm/i915/gt/intel_context.h:14,
> >                  from drivers/gpu/drm/i915/gem/i915_gem_context.h:12,
> >                  from drivers/gpu/drm/i915/i915_gem.c:44:
> > include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here
> >   331 | extern int pm_suspend(suspend_state_t state);
> >       |            ^~~~~~~~~~
> >
> > Caused by commit
> >
> >   5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
> >
> > interacting with commit
> >
> >   3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
> >
> > from Linus' tree (v4.20-rc1)
>
> Thank you very much for taking care of this!
>

Hi, this issue is fixed in
https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-gt-next&id=5b11705608898c31a1cae5340555ee60d5a4fa45

And I think the pull request is in
https://lists.freedesktop.org/archives/intel-gfx/2021-May/267588.html

Thanks

>
> > I have added the following merge fix patch:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 1 Jun 2021 10:25:49 +1000
> > Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Looks like the proper solution to me. I think this should be added to
> the i915 tree. D'accord everyone?
>
> Reviewed-by: Wolfram Sang <wsa@kernel.org>
>
> Kind regards,
>
>    Wolfram
>

Re: linux-next: build failure after merge of the i2c tree

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]


> Hi, this issue is fixed in
> https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-gt-next&id=5b11705608898c31a1cae5340555ee60d5a4fa45
> 
> And I think the pull request is in
> https://lists.freedesktop.org/archives/intel-gfx/2021-May/267588.html

Thanks for the heads up. So, I'll wait with my pull request for the next
merge window until drm has landed first.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2036 bytes --]

Hi all,

On Tue, 4 Oct 2022 11:20:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/clk/clk-versaclock7.c:1304:19: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)' [-Werror=incompatible-pointer-types]
>  1304 |         .remove = vc7_remove,
>       |                   ^~~~~~~~~~
> drivers/clk/clk-versaclock7.c:1304:19: note: (near initialization for 'vc7_i2c_driver.remove')
> 
> Caused by commit
> 
>   48c5e98fedd9 ("clk: Renesas versaclock7 ccf device driver")
> 
> from the clk tree interacting with commit
> 
>   ed5c2f5fd10d ("i2c: Make remove callback return void")
> 
> from the i2c tree.
> 
> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 4 Oct 2022 11:13:45 +1100
> Subject: [PATCH] clk: fix up for "i2c: Make remove callback return void"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/clk/clk-versaclock7.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/clk/clk-versaclock7.c b/drivers/clk/clk-versaclock7.c
> index 050807cf971f..8e4f86e852aa 100644
> --- a/drivers/clk/clk-versaclock7.c
> +++ b/drivers/clk/clk-versaclock7.c
> @@ -1235,14 +1235,12 @@ static int vc7_probe(struct i2c_client *client)
>  	return ret;
>  }
>  
> -static int vc7_remove(struct i2c_client *client)
> +static void vc7_remove(struct i2c_client *client)
>  {
>  	struct vc7_driver_data *vc7 = i2c_get_clientdata(client);
>  
>  	of_clk_del_provider(client->dev.of_node);
>  	clk_unregister_fixed_rate(vc7->clk_apll.clk);
> -
> -	return 0;
>  }
>  
>  static bool vc7_volatile_reg(struct device *dev, unsigned int reg)
> -- 
> 2.35.1

I have applied this patch to the merge of the clk tree today (since
Linus has merged the i2c tree).

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 2157 bytes --]

Hello clk guys,

On Tue, Oct 04, 2022 at 11:20:59AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/clk/clk-versaclock7.c:1304:19: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)' [-Werror=incompatible-pointer-types]
>  1304 |         .remove = vc7_remove,
>       |                   ^~~~~~~~~~
> drivers/clk/clk-versaclock7.c:1304:19: note: (near initialization for 'vc7_i2c_driver.remove')
> 
> Caused by commit
> 
>   48c5e98fedd9 ("clk: Renesas versaclock7 ccf device driver")
> 
> from the clk tree interacting with commit
> 
>   ed5c2f5fd10d ("i2c: Make remove callback return void")
> 
> from the i2c tree.

You might want to pull

	https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable

to fix this in your tree.

> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 4 Oct 2022 11:13:45 +1100
> Subject: [PATCH] clk: fix up for "i2c: Make remove callback return void"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/clk/clk-versaclock7.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/clk/clk-versaclock7.c b/drivers/clk/clk-versaclock7.c
> index 050807cf971f..8e4f86e852aa 100644
> --- a/drivers/clk/clk-versaclock7.c
> +++ b/drivers/clk/clk-versaclock7.c
> @@ -1235,14 +1235,12 @@ static int vc7_probe(struct i2c_client *client)
>  	return ret;
>  }
>  
> -static int vc7_remove(struct i2c_client *client)
> +static void vc7_remove(struct i2c_client *client)
>  {
>  	struct vc7_driver_data *vc7 = i2c_get_clientdata(client);
>  
>  	of_clk_del_provider(client->dev.of_node);
>  	clk_unregister_fixed_rate(vc7->clk_apll.clk);
> -
> -	return 0;
>  }

Looks good.

Thanks
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1744 bytes --]

Hi all,

After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/clk/clk-versaclock7.c:1304:19: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)' [-Werror=incompatible-pointer-types]
 1304 |         .remove = vc7_remove,
      |                   ^~~~~~~~~~
drivers/clk/clk-versaclock7.c:1304:19: note: (near initialization for 'vc7_i2c_driver.remove')

Caused by commit

  48c5e98fedd9 ("clk: Renesas versaclock7 ccf device driver")

from the clk tree interacting with commit

  ed5c2f5fd10d ("i2c: Make remove callback return void")

from the i2c tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2022 11:13:45 +1100
Subject: [PATCH] clk: fix up for "i2c: Make remove callback return void"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/clk/clk-versaclock7.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/clk/clk-versaclock7.c b/drivers/clk/clk-versaclock7.c
index 050807cf971f..8e4f86e852aa 100644
--- a/drivers/clk/clk-versaclock7.c
+++ b/drivers/clk/clk-versaclock7.c
@@ -1235,14 +1235,12 @@ static int vc7_probe(struct i2c_client *client)
 	return ret;
 }
 
-static int vc7_remove(struct i2c_client *client)
+static void vc7_remove(struct i2c_client *client)
 {
 	struct vc7_driver_data *vc7 = i2c_get_clientdata(client);
 
 	of_clk_del_provider(client->dev.of_node);
 	clk_unregister_fixed_rate(vc7->clk_apll.clk);
-
-	return 0;
 }
 
 static bool vc7_volatile_reg(struct device *dev, unsigned int reg)
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 519 bytes --]

Hi Stephen,

> It is declared in include/linux/gpio/consumer.h which is not directly
> included by drivers/i2c/i2c-core-base.c ...
> 
> I have used the i2c tree from next-20171127 for today.

Yes, thank you for the report! buildbot now reported this same problem
and Phil has already sent fixes which I just pushed out.

I think I should give such refactoring series an extra round of buildbot
by having them in a seperate branch for a while before I merge them into
for-next...

Thanks,

   Wolfram


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

Hi Wolfram,

After merging the i2c tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/i2c/i2c-core-base.c: In function 'get_scl_gpio_value':
drivers/i2c/i2c-core-base.c:137:9: error: implicit declaration of function 'gpiod_get_value_cansleep' [-Werror=implicit-function-declaration]
  return gpiod_get_value_cansleep(adap->bus_recovery_info->scl_gpiod);
         ^
drivers/i2c/i2c-core-base.c: In function 'set_scl_gpio_value':
drivers/i2c/i2c-core-base.c:142:2: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Werror=implicit-function-declaration]
  gpiod_set_value_cansleep(adap->bus_recovery_info->scl_gpiod, val);
  ^

Caused by commit

  3991c5c80bea ("i2c: Switch to using gpiod interface for gpio bus recovery")

It is declared in include/linux/gpio/consumer.h which is not directly
included by drivers/i2c/i2c-core-base.c ...

I have used the i2c tree from next-20171127 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the i2c tree

[Shawn Guo]

Hi Stephen,

On Mon, Jun 26, 2017 at 11:09:07AM +1000, Stephen Rothwell wrote:
> Hi Wolfram,
> 
> After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/i2c/busses/i2c-zx2967.c: In function 'zx2967_i2c_writesb':
> drivers/i2c/busses/i2c-zx2967.c:87:2: error: implicit declaration of function 'writesb' [-Werror=implicit-function-declaration]
>   writesb(i2c->reg_base + reg, data, len);
>   ^
> drivers/i2c/busses/i2c-zx2967.c: In function 'zx2967_i2c_readsb':
> drivers/i2c/busses/i2c-zx2967.c:93:2: error: implicit declaration of function 'readsb' [-Werror=implicit-function-declaration]
>   readsb(i2c->reg_base + reg, data, len);
>   ^
> 
> Caused by commit
> 
>   9615a01f71ca ("i2c: zx2967: add i2c controller driver for ZTE's zx2967 family")
> 
> Forgotten some include file, presumably.  And COMPILE_TEST may have
> been a bit hopeful :-)

Thanks for reporting it.  I have sent a fix [1] for it yesterday, which
hopefully will be applied soon.

Shawn

[1] https://patchwork.ozlabs.org/patch/780357/

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

Hi Wolfram,

After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/i2c/busses/i2c-zx2967.c: In function 'zx2967_i2c_writesb':
drivers/i2c/busses/i2c-zx2967.c:87:2: error: implicit declaration of function 'writesb' [-Werror=implicit-function-declaration]
  writesb(i2c->reg_base + reg, data, len);
  ^
drivers/i2c/busses/i2c-zx2967.c: In function 'zx2967_i2c_readsb':
drivers/i2c/busses/i2c-zx2967.c:93:2: error: implicit declaration of function 'readsb' [-Werror=implicit-function-declaration]
  readsb(i2c->reg_base + reg, data, len);
  ^

Caused by commit

  9615a01f71ca ("i2c: zx2967: add i2c controller driver for ZTE's zx2967 family")

Forgotten some include file, presumably.  And COMPILE_TEST may have
been a bit hopeful :-)

I have used the i2c tree from next-20170623 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the i2c tree

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 798 bytes --]

Stephen,

> > After merging the i2c tree, today's linux-next build (powerpc
> > ppc44x_defconfig) failed like this:

Oops, yes.

> >  /* Bus timings (in ns) for bit-banging */
> > -static struct i2c_timings {
> > +static struct ibm_i2c_timings {

I changed it to ibm_iic_timings for consistency reasons...

> >  	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];

... and fixed the placement of the * operator ...

> >  	u8 mask, v, sda;
> >  	int i, res;
> >  
> > -- 
> > 2.6.2
> 
> Ping?

... and applied to for-next, thanks! The patch got lost because the
i2c-list was not on CC and thus patchwork couldn't catch it.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

Hi all,

On Wed, 16 Dec 2015 15:48:13 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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

Ping?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

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

Re: linux-next: build failure after merge of the i2c tree

[Dmitry Torokhov]

On Mon, Aug 24, 2015 at 5:51 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Wolfram,
>
> After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> ERROR: "of_irq_get_byname" [drivers/i2c/i2c-core.ko] undefined!
>
> Caused by commit
>
>   efb6a10b761e ("i2c: allow specifying separate wakeup interrupt in device tree")
>
> I have used the i2c tree from next-20150824 for today.

Ugh, of_get_irq_byname is not exported; I'll send a patch.

Thanks.

-- 
Dmitry

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

Hi Wolfram,

After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "of_irq_get_byname" [drivers/i2c/i2c-core.ko] undefined!

Caused by commit

  efb6a10b761e ("i2c: allow specifying separate wakeup interrupt in device tree")

I have used the i2c tree from next-20150824 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the i2c tree

[Pantelis Antoniou]

Hi Stephen,

> On Jan 16, 2015, at 04:22 , Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Hi Wolfram,
> 
> After merging the i2c tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/i2c/i2c-core.c: In function 'i2c_unregister_device':
> drivers/i2c/i2c-core.c:1016:3: error: implicit declaration of function 'of_node_clear_flag' [-Werror=implicit-function-declaration]
>   of_node_clear_flag(client->dev.of_node, OF_POPULATED);
>   ^
> drivers/i2c/i2c-core.c:1016:43: error: 'OF_POPULATED' undeclared (first use in this function)
>   of_node_clear_flag(client->dev.of_node, OF_POPULATED);
>                                           ^
> 
> Caused by commit d5285c36e6d2 ("i2c: Mark instantiated device nodes
> with OF_POPULATE").
> 
> I have used the version of the i2c tree from next-20150115 for today.

A patch that fixes it has already been posted.

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 

Regards

— Pantelis

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 811 bytes --]

Hi Wolfram,

After merging the i2c tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/i2c/i2c-core.c: In function 'i2c_unregister_device':
drivers/i2c/i2c-core.c:1016:3: error: implicit declaration of function 'of_node_clear_flag' [-Werror=implicit-function-declaration]
   of_node_clear_flag(client->dev.of_node, OF_POPULATED);
   ^
drivers/i2c/i2c-core.c:1016:43: error: 'OF_POPULATED' undeclared (first use in this function)
   of_node_clear_flag(client->dev.of_node, OF_POPULATED);
                                           ^

Caused by commit d5285c36e6d2 ("i2c: Mark instantiated device nodes
with OF_POPULATE").

I have used the version of the i2c tree from next-20150115 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

> Caused by commit 5a6f1566f6a0 ("i2c: rk3x: handle dynamic clock rate
> changes correctly").

Yes, missing Kconfig dependency on COMMON_CLK. I'll add and push the fix
today. Thanks!



[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3033 bytes --]

Hi Wolfram,

After merging the i2c tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/i2c/busses/i2c-rk3x.c: In function 'rk3x_i2c_clk_notifier_cb':
drivers/i2c/busses/i2c-rk3x.c:634:7: error: 'PRE_RATE_CHANGE' undeclared (first use in this function)
  case PRE_RATE_CHANGE:
       ^
drivers/i2c/busses/i2c-rk3x.c:634:7: note: each undeclared identifier is reported only once for each function it appears in
drivers/i2c/busses/i2c-rk3x.c:635:31: error: dereferencing pointer to incomplete type
   if (rk3x_i2c_calc_divs(ndata->new_rate, i2c->scl_frequency,
                               ^
drivers/i2c/busses/i2c-rk3x.c:641:12: error: dereferencing pointer to incomplete type
   if (ndata->new_rate > ndata->old_rate)
            ^
drivers/i2c/busses/i2c-rk3x.c:641:30: error: dereferencing pointer to incomplete type
   if (ndata->new_rate > ndata->old_rate)
                              ^
drivers/i2c/busses/i2c-rk3x.c:642:33: error: dereferencing pointer to incomplete type
    rk3x_i2c_adapt_div(i2c, ndata->new_rate);
                                 ^
drivers/i2c/busses/i2c-rk3x.c:645:7: error: 'POST_RATE_CHANGE' undeclared (first use in this function)
  case POST_RATE_CHANGE:
       ^
drivers/i2c/busses/i2c-rk3x.c:647:12: error: dereferencing pointer to incomplete type
   if (ndata->new_rate < ndata->old_rate)
            ^
drivers/i2c/busses/i2c-rk3x.c:647:30: error: dereferencing pointer to incomplete type
   if (ndata->new_rate < ndata->old_rate)
                              ^
drivers/i2c/busses/i2c-rk3x.c:648:33: error: dereferencing pointer to incomplete type
    rk3x_i2c_adapt_div(i2c, ndata->new_rate);
                                 ^
drivers/i2c/busses/i2c-rk3x.c:650:7: error: 'ABORT_RATE_CHANGE' undeclared (first use in this function)
  case ABORT_RATE_CHANGE:
       ^
drivers/i2c/busses/i2c-rk3x.c:652:12: error: dereferencing pointer to incomplete type
   if (ndata->new_rate > ndata->old_rate)
            ^
drivers/i2c/busses/i2c-rk3x.c:652:30: error: dereferencing pointer to incomplete type
   if (ndata->new_rate > ndata->old_rate)
                              ^
drivers/i2c/busses/i2c-rk3x.c:653:33: error: dereferencing pointer to incomplete type
    rk3x_i2c_adapt_div(i2c, ndata->old_rate);
                                 ^
drivers/i2c/busses/i2c-rk3x.c: In function 'rk3x_i2c_probe':
drivers/i2c/busses/i2c-rk3x.c:941:2: error: implicit declaration of function 'clk_notifier_register' [-Werror=implicit-function-declaration]
  ret = clk_notifier_register(i2c->clk, &i2c->clk_rate_nb);
  ^
drivers/i2c/busses/i2c-rk3x.c:961:2: error: implicit declaration of function 'clk_notifier_unregister' [-Werror=implicit-function-declaration]
  clk_notifier_unregister(i2c->clk, &i2c->clk_rate_nb);
  ^

Caused by commit 5a6f1566f6a0 ("i2c: rk3x: handle dynamic clock rate
changes correctly").

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2716 bytes --]

Hi Wolfram,

After merging the i2c tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/i2c/busses/i2c-bcm-kona.c: In function 'bcm_kona_send_i2c_cmd':
drivers/i2c/busses/i2c-bcm-kona.c:268:2: error: implicit declaration of function 'INIT_COMPLETION' [-Werror=implicit-function-declaration]

Caused by commit 93d17247118c ("i2c: bcm-kona: Introduce Broadcom I2C
Driver") interacting with commit 62026aedaace ("sched: remove
INIT_COMPLETION") from Linus` tree.

I have applied the following merge fix patch and can carry it as
necessary (please inform Linus of this when you ask him to merge your
tree).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Nov 2013 10:26:37 +1100
Subject: [PATCH] i2c: bcm-kona: fix for INIT_COMPLETION -> reinit_completion
 API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/i2c/busses/i2c-bcm-kona.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/busses/i2c-bcm-kona.c b/drivers/i2c/busses/i2c-bcm-kona.c
index 7b7b7622b0d1..865e5dd9e655 100644
--- a/drivers/i2c/busses/i2c-bcm-kona.c
+++ b/drivers/i2c/busses/i2c-bcm-kona.c
@@ -265,7 +265,7 @@ static int bcm_kona_send_i2c_cmd(struct bcm_kona_i2c_dev *dev,
 	writel(IER_I2C_INT_EN_MASK, dev->base + IER_OFFSET);
 
 	/* Mark as incomplete before sending the command */
-	INIT_COMPLETION(dev->done);
+	reinit_completion(&dev->done);
 
 	/* Send the command */
 	bcm_kona_i2c_send_cmd_to_ctrl(dev, cmd);
@@ -295,7 +295,7 @@ static int bcm_kona_i2c_read_fifo_single(struct bcm_kona_i2c_dev *dev,
 	unsigned long time_left = msecs_to_jiffies(I2C_TIMEOUT);
 
 	/* Mark as incomplete before starting the RX FIFO */
-	INIT_COMPLETION(dev->done);
+	reinit_completion(&dev->done);
 
 	/* Unmask the read complete interrupt */
 	writel(IER_READ_COMPLETE_INT_MASK, dev->base + IER_OFFSET);
@@ -372,7 +372,7 @@ static int bcm_kona_i2c_write_byte(struct bcm_kona_i2c_dev *dev, uint8_t data,
 	writel(IER_I2C_INT_EN_MASK, dev->base + IER_OFFSET);
 
 	/* Mark as incomplete before sending the data */
-	INIT_COMPLETION(dev->done);
+	reinit_completion(&dev->done);
 
 	/* Send one byte of data */
 	writel(data, dev->base + DAT_OFFSET);
@@ -407,7 +407,7 @@ static int bcm_kona_i2c_write_fifo_single(struct bcm_kona_i2c_dev *dev,
 	unsigned int fifo_status;
 
 	/* Mark as incomplete before sending data to the TX FIFO */
-	INIT_COMPLETION(dev->done);
+	reinit_completion(&dev->done);
 
 	/* Unmask the fifo empty and nak interrupt */
 	writel(IER_FIFO_INT_EN_MASK | IER_NOACK_EN_MASK,
-- 
1.8.4.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Jean Delvare]

On Thu, 19 May 2011 13:27:04 +1000, Stephen Rothwell wrote:
> Hi Jean,
> 
> After merging the i2c tree, today's linux-next build (i386 defconfig)
> failed like this:
> 
> drivers/built-in.o: In function `i2c_i801_init':
> i2c-i801.c:(.init.text+0x88b9): undefined reference to `check_signature'
> 
> Probably caused by commit fc02951b3293 ("i2c-i801: Don't depend on other
> kernel driver config options").  Reverting that commit fixes the problem,
> so I have done that for today.

Oops, good catch. Fix is:

---
 drivers/i2c/busses/Kconfig |    1 +
 1 file changed, 1 insertion(+)

--- linux-2.6.39-rc7.orig/drivers/i2c/busses/Kconfig	2011-05-19 09:02:42.000000000 +0200
+++ linux-2.6.39-rc7/drivers/i2c/busses/Kconfig	2011-05-19 11:03:36.000000000 +0200
@@ -79,6 +79,7 @@ config I2C_AMD8111
 config I2C_I801
 	tristate "Intel 82801 (ICH/PCH)"
 	depends on PCI
+	select CHECK_SIGNATURE if X86 && DMI
 	help
 	  If you say yes to this option, support will be included for the Intel
 	  801 family of mainboard I2C interfaces.  Specifically, the following

I'll fold it in the faulty patch so it should build fine tomorrow.

-- 
Jean Delvare

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 520 bytes --]

Hi Jean,

After merging the i2c tree, today's linux-next build (i386 defconfig)
failed like this:

drivers/built-in.o: In function `i2c_i801_init':
i2c-i801.c:(.init.text+0x88b9): undefined reference to `check_signature'

Probably caused by commit fc02951b3293 ("i2c-i801: Don't depend on other
kernel driver config options").  Reverting that commit fixes the problem,
so I have done that for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

Hi Jean,

On Mon, 21 Jun 2010 07:57:33 +0200 Jean Delvare <khali@linux-fr.org> wrote:
>
> Oops, sorry, forgot to refresh the patch before pushing it. This is
> fixed now.

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Jean Delvare]

On Mon, 21 Jun 2010 12:03:31 +1000, Stephen Rothwell wrote:
> Hi Jean,
> 
> After merging the i2c tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/i2c/i2c-core.c: In function 'i2c_detect':
> drivers/i2c/i2c-core.c:1460: error: 'adap' undeclared (first use in this function)

Oops, sorry, forgot to refresh the patch before pushing it. This is
fixed now.

> Caused by commit b741e61eb906816f78acbf361797fd408abdc715 ("i2c: Fix
> probability check").  The typo in this patch is probably why the later
> patch that I dropped would not apply ...

You are correct.

> I have used the i2c tree form next-20100618 for today.


-- 
Jean Delvare

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

Hi Jean,

After merging the i2c tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/i2c/i2c-core.c: In function 'i2c_detect':
drivers/i2c/i2c-core.c:1460: error: 'adap' undeclared (first use in this function)

Caused by commit b741e61eb906816f78acbf361797fd408abdc715 ("i2c: Fix
probability check").  The typo in this patch is probably why the later
patch that I dropped would not apply ...

I have used the i2c tree form next-20100618 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

Hi Jean,

On Mon, 1 Mar 2010 11:43:30 +0100 Jean Delvare <khali@linux-fr.org> wrote:
>
> Oops, I am very sorry, thanks a lot for reporting. This is fixed now,
> sorry for the annoyance.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: build failure after merge of the i2c tree

[Jean Delvare]

Hi Stephen,

On Mon, 1 Mar 2010 13:12:31 +1100, Stephen Rothwell wrote:
> Hi Jean,
> 
> After merging the i2c tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/i2c/busses/i2c-powermac.c: In function 'i2c_powermac_smbus_xfer':
> drivers/i2c/busses/i2c-powermac.c:125: error: 'err' undeclared (first use in this function)
> 
> Caused by commit 2fe61c97a4b1be56d93a84992ffcf00d55f60f63 ("i2c-powermac:
> Be less verbose in the absence of real errors").
> 
> I have used the i2c tree from next-20100226 for today.

Oops, I am very sorry, thanks a lot for reporting. This is fixed now,
sorry for the annoyance.

-- 
Jean Delvare

linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

Hi Jean,

After merging the i2c tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/i2c/busses/i2c-powermac.c: In function 'i2c_powermac_smbus_xfer':
drivers/i2c/busses/i2c-powermac.c:125: error: 'err' undeclared (first use in this function)

Caused by commit 2fe61c97a4b1be56d93a84992ffcf00d55f60f63 ("i2c-powermac:
Be less verbose in the absence of real errors").

I have used the i2c tree from next-20100226 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]