2012-05-07 07:15:09

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the final tree (battery tree related)

Hi all,

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

drivers/power/smb347-charger.c: In function 'smb347_probe':
drivers/power/smb347-charger.c:1039:2: error: implicit declaration of function 'IS_ERR' [-Werror=implicit-function-declaration]
drivers/power/smb347-charger.c:1040:3: error: implicit declaration of function 'PTR_ERR' [-Werror=implicit-function-declaration]

Caused by commit 34298d40e585 ("smb347-charger: Convert to regmap API").

I have reverted that commit for today (and commit fcc015cda7df
"smb347-charger: Clean up battery attributes" that conflicted with the
revert).
--
Cheers,
Stephen Rothwell [email protected]


Attachments:
(No filename) (710.00 B)
(No filename) (836.00 B)
Download all attachments

2012-05-07 08:25:23

by Mika Westerberg

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the final tree (battery tree related)

On Mon, May 07, 2012 at 05:14:58PM +1000, Stephen Rothwell wrote:
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/power/smb347-charger.c: In function 'smb347_probe':
> drivers/power/smb347-charger.c:1039:2: error: implicit declaration of function 'IS_ERR' [-Werror=implicit-function-declaration]
> drivers/power/smb347-charger.c:1040:3: error: implicit declaration of function 'PTR_ERR' [-Werror=implicit-function-declaration]
>
> Caused by commit 34298d40e585 ("smb347-charger: Convert to regmap API").

I'm unable to reproduce this on x86 build. I guess <linux/err.h> gets
included implicitly there.

Patch below should fix this. Anton, care to pick this one as well (or fold
it into the 34298d40e585 ("smb347-charger: Convert to regmap API") commit)?

From: Mika Westerberg <[email protected]>
Subject: [PATCH] smb347-charger: include missing <linux/err.h>

Without the include we get build errors like:

drivers/power/smb347-charger.c: In function 'smb347_probe':
drivers/power/smb347-charger.c:1039:2: error: implicit declaration of function 'IS_ERR' [-Werror=implicit-function-declaration]
drivers/power/smb347-charger.c:1040:3: error: implicit declaration of function 'PTR_ERR' [-Werror=implicit-function-declaration]

Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Mika Westerberg <[email protected]>
---
drivers/power/smb347-charger.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/power/smb347-charger.c b/drivers/power/smb347-charger.c
index 09d19d2..f8eedd8 100644
--- a/drivers/power/smb347-charger.c
+++ b/drivers/power/smb347-charger.c
@@ -11,6 +11,7 @@
* published by the Free Software Foundation.
*/

+#include <linux/err.h>
#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/module.h>
--
1.7.9.1

2012-05-16 06:13:06

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the final tree (battery tree related)

Hi all,

On Mon, 7 May 2012 11:26:37 +0300 Mika Westerberg <[email protected]> wrote:
>
> On Mon, May 07, 2012 at 05:14:58PM +1000, Stephen Rothwell wrote:
> >
> > After merging the final tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > drivers/power/smb347-charger.c: In function 'smb347_probe':
> > drivers/power/smb347-charger.c:1039:2: error: implicit declaration of function 'IS_ERR' [-Werror=implicit-function-declaration]
> > drivers/power/smb347-charger.c:1040:3: error: implicit declaration of function 'PTR_ERR' [-Werror=implicit-function-declaration]
> >
> > Caused by commit 34298d40e585 ("smb347-charger: Convert to regmap API").
>
> I'm unable to reproduce this on x86 build. I guess <linux/err.h> gets
> included implicitly there.
>
> Patch below should fix this. Anton, care to pick this one as well (or fold
> it into the 34298d40e585 ("smb347-charger: Convert to regmap API") commit)?
>
> From: Mika Westerberg <[email protected]>
> Subject: [PATCH] smb347-charger: include missing <linux/err.h>
>
> Without the include we get build errors like:
>
> drivers/power/smb347-charger.c: In function 'smb347_probe':
> drivers/power/smb347-charger.c:1039:2: error: implicit declaration of function 'IS_ERR' [-Werror=implicit-function-declaration]
> drivers/power/smb347-charger.c:1040:3: error: implicit declaration of function 'PTR_ERR' [-Werror=implicit-function-declaration]
>
> Reported-by: Stephen Rothwell <[email protected]>
> Signed-off-by: Mika Westerberg <[email protected]>
> ---
> drivers/power/smb347-charger.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/power/smb347-charger.c b/drivers/power/smb347-charger.c
> index 09d19d2..f8eedd8 100644
> --- a/drivers/power/smb347-charger.c
> +++ b/drivers/power/smb347-charger.c
> @@ -11,6 +11,7 @@
> * published by the Free Software Foundation.
> */
>
> +#include <linux/err.h>
> #include <linux/gpio.h>
> #include <linux/kernel.h>
> #include <linux/module.h>

Ping?
--
Cheers,
Stephen Rothwell [email protected]


Attachments:
(No filename) (2.09 kB)
(No filename) (836.00 B)
Download all attachments

2012-05-19 00:18:14

by Anton Vorontsov

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the final tree (battery tree related)

On Wed, May 16, 2012 at 04:12:56PM +1000, Stephen Rothwell wrote:
[...]
> > diff --git a/drivers/power/smb347-charger.c b/drivers/power/smb347-charger.c
> > index 09d19d2..f8eedd8 100644
> > --- a/drivers/power/smb347-charger.c
> > +++ b/drivers/power/smb347-charger.c
> > @@ -11,6 +11,7 @@
> > * published by the Free Software Foundation.
> > */
> >
> > +#include <linux/err.h>
> > #include <linux/gpio.h>
> > #include <linux/kernel.h>
> > #include <linux/module.h>
>
> Ping?

Applied, thank you!

--
Anton Vorontsov
Email: [email protected]