2012-02-08 10:57:10

by Luciano Coelho

[permalink] [raw]
Subject: [PATCH] I2C: OMAP: fix build breakage when CONFIG_OF is not set

Since commit 6145197be6cc0583fa1a2f4ec1079d366137061e, building
i2c_omap.c breaks if CONFIG_OF is not set:

drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
drivers/i2c/busses/i2c-omap.c:1021: error: 'omap_i2c_of_match' undeclared (first use in this function)
drivers/i2c/busses/i2c-omap.c:1021: error: (Each undeclared identifier is reported only once
drivers/i2c/busses/i2c-omap.c:1021: error: for each function it appears in.)

This is because the definition of omap_i2c_of_match is #ifdef'd on
CONFIG_OF, but the usage of it is not.

Since the places where omap_ic2_of_match are prepared to get NULL
pointers if CONFIG_OF is not defined, we can simply define it to NULL.

Cc: Benoit Cousson <[email protected]>
Signed-off-by: Luciano Coelho <[email protected]>
---
drivers/i2c/busses/i2c-omap.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index f713eac..fd200eb 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -979,6 +979,8 @@ static const struct of_device_id omap_i2c_of_match[] = {
{ },
};
MODULE_DEVICE_TABLE(of, omap_i2c_of_match);
+#else
+static const struct of_device_id *omap_i2c_of_match = NULL;
#endif

static int __devinit
--
1.7.5.4


2012-02-08 11:00:06

by Felipe Balbi

[permalink] [raw]
Subject: Re: [PATCH] I2C: OMAP: fix build breakage when CONFIG_OF is not set

On Wed, Feb 08, 2012 at 12:56:52PM +0200, Luciano Coelho wrote:
> Since commit 6145197be6cc0583fa1a2f4ec1079d366137061e, building

we generally like to see the commit subject here too. And adding the
abbreviated commit instead of the full sha1, wouldn't hurt either ;-)

> i2c_omap.c breaks if CONFIG_OF is not set:
>
> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
> drivers/i2c/busses/i2c-omap.c:1021: error: 'omap_i2c_of_match' undeclared (first use in this function)
> drivers/i2c/busses/i2c-omap.c:1021: error: (Each undeclared identifier is reported only once
> drivers/i2c/busses/i2c-omap.c:1021: error: for each function it appears in.)
>
> This is because the definition of omap_i2c_of_match is #ifdef'd on
> CONFIG_OF, but the usage of it is not.
>
> Since the places where omap_ic2_of_match are prepared to get NULL
> pointers if CONFIG_OF is not defined, we can simply define it to NULL.
>
> Cc: Benoit Cousson <[email protected]>
> Signed-off-by: Luciano Coelho <[email protected]>

after fixing the commit log, you can add:

Reviewed-by: Felipe Balbi <[email protected]>

if you want.

> ---
> drivers/i2c/busses/i2c-omap.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index f713eac..fd200eb 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -979,6 +979,8 @@ static const struct of_device_id omap_i2c_of_match[] = {
> { },
> };
> MODULE_DEVICE_TABLE(of, omap_i2c_of_match);
> +#else
> +static const struct of_device_id *omap_i2c_of_match = NULL;
> #endif
>
> static int __devinit
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

--
balbi


Attachments:
(No filename) (1.89 kB)
signature.asc (836.00 B)
Digital signature
Download all attachments

2012-02-08 11:01:35

by Luciano Coelho

[permalink] [raw]
Subject: Re: [PATCH] I2C: OMAP: fix build breakage when CONFIG_OF is not set

On Wed, 2012-02-08 at 12:56 +0200, Luciano Coelho wrote:
> Since commit 6145197be6cc0583fa1a2f4ec1079d366137061e, building
> i2c_omap.c breaks if CONFIG_OF is not set:
>
> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
> drivers/i2c/busses/i2c-omap.c:1021: error: 'omap_i2c_of_match' undeclared (first use in this function)
> drivers/i2c/busses/i2c-omap.c:1021: error: (Each undeclared identifier is reported only once
> drivers/i2c/busses/i2c-omap.c:1021: error: for each function it appears in.)
>
> This is because the definition of omap_i2c_of_match is #ifdef'd on
> CONFIG_OF, but the usage of it is not.
>
> Since the places where omap_ic2_of_match are prepared to get NULL
> pointers if CONFIG_OF is not defined, we can simply define it to NULL.
>
> Cc: Benoit Cousson <[email protected]>
> Signed-off-by: Luciano Coelho <[email protected]>
> ---

Forgot to say that I think this should go into 3.3, since it's a build
break.

--
Cheers,
Luca.

2012-02-08 11:04:46

by Luciano Coelho

[permalink] [raw]
Subject: Re: [PATCH] I2C: OMAP: fix build breakage when CONFIG_OF is not set

On Wed, 2012-02-08 at 12:59 +0200, Felipe Balbi wrote:
> On Wed, Feb 08, 2012 at 12:56:52PM +0200, Luciano Coelho wrote:
> > Since commit 6145197be6cc0583fa1a2f4ec1079d366137061e, building
>
> we generally like to see the commit subject here too. And adding the
> abbreviated commit instead of the full sha1, wouldn't hurt either ;-)

Ok, different practices. :)

I'll send v2.


> > i2c_omap.c breaks if CONFIG_OF is not set:
> >
> > drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
> > drivers/i2c/busses/i2c-omap.c:1021: error: 'omap_i2c_of_match' undeclared (first use in this function)
> > drivers/i2c/busses/i2c-omap.c:1021: error: (Each undeclared identifier is reported only once
> > drivers/i2c/busses/i2c-omap.c:1021: error: for each function it appears in.)
> >
> > This is because the definition of omap_i2c_of_match is #ifdef'd on
> > CONFIG_OF, but the usage of it is not.
> >
> > Since the places where omap_ic2_of_match are prepared to get NULL
> > pointers if CONFIG_OF is not defined, we can simply define it to NULL.
> >
> > Cc: Benoit Cousson <[email protected]>
> > Signed-off-by: Luciano Coelho <[email protected]>
>
> after fixing the commit log, you can add:
>
> Reviewed-by: Felipe Balbi <[email protected]>
>
> if you want.

Thanks for your quick review!

--
Cheers,
Luca.

2012-02-08 11:13:01

by Shubhrajyoti Datta

[permalink] [raw]
Subject: Re: [PATCH] I2C: OMAP: fix build breakage when CONFIG_OF is not set

On Wed, Feb 8, 2012 at 4:34 PM, Luciano Coelho <[email protected]> wrote:
> On Wed, 2012-02-08 at 12:59 +0200, Felipe Balbi wrote:
>> On Wed, Feb 08, 2012 at 12:56:52PM +0200, Luciano Coelho wrote:
>> > Since commit 6145197be6cc0583fa1a2f4ec1079d366137061e, building
>>
>> we generally like to see the commit subject here too. And adding the
>> abbreviated commit instead of the full sha1, wouldn't hurt either ;-)
>
> Ok, different practices. :)

However there was already a discurssion.
Anyways thanks for the patch.
http://permalink.gmane.org/gmane.linux.ports.arm.omap/69796


>
> I'll send v2.
I think there was already a fix for this.

http://www.spinics.net/lists/linux-omap/msg63151.html

Anyways thanks for the patch.

>
>
>> > i2c_omap.c breaks if CONFIG_OF is not set:
>> >
>> > drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
>> > drivers/i2c/busses/i2c-omap.c:1021: error: 'omap_i2c_of_match' undeclared (first use in this function)
>> > drivers/i2c/busses/i2c-omap.c:1021: error: (Each undeclared identifier is reported only once
>> > drivers/i2c/busses/i2c-omap.c:1021: error: for each function it appears in.)
>> >
>> > This is because the definition of omap_i2c_of_match is #ifdef'd on
>> > CONFIG_OF, but the usage of it is not.
>> >
>> > Since the places where omap_ic2_of_match are prepared to get NULL
>> > pointers if CONFIG_OF is not defined, we can simply define it to NULL.
>> >
>> > Cc: Benoit Cousson <[email protected]>
>> > Signed-off-by: Luciano Coelho <[email protected]>
>>
>> after fixing the commit log, you can add:
>>
>> Reviewed-by: Felipe Balbi <[email protected]>
>>
>> if you want.
>
> Thanks for your quick review!
>
> --
> Cheers,
> Luca.
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to [email protected]
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html

2012-02-08 11:25:50

by Luciano Coelho

[permalink] [raw]
Subject: Re: [PATCH] I2C: OMAP: fix build breakage when CONFIG_OF is not set

On Wed, 2012-02-08 at 16:42 +0530, Shubhrajyoti Datta wrote:
> On Wed, Feb 8, 2012 at 4:34 PM, Luciano Coelho <[email protected]> wrote:
> > On Wed, 2012-02-08 at 12:59 +0200, Felipe Balbi wrote:
> >> On Wed, Feb 08, 2012 at 12:56:52PM +0200, Luciano Coelho wrote:
> >> > Since commit 6145197be6cc0583fa1a2f4ec1079d366137061e, building
> >>
> >> we generally like to see the commit subject here too. And adding the
> >> abbreviated commit instead of the full sha1, wouldn't hurt either ;-)
> >
> > Ok, different practices. :)
>
> However there was already a discurssion.
> Anyways thanks for the patch.
> http://permalink.gmane.org/gmane.linux.ports.arm.omap/69796
>
>
> >
> > I'll send v2.
> I think there was already a fix for this.
>
> http://www.spinics.net/lists/linux-omap/msg63151.html
>
> Anyways thanks for the patch.

Ah, okay. Thanks for the info, I hadn't seen these.

--
Cheers,
Luca.

2012-02-08 15:49:17

by Benoit Cousson

[permalink] [raw]
Subject: Re: [PATCH] I2C: OMAP: fix build breakage when CONFIG_OF is not set

Hi Luca,

On 2/8/2012 12:25 PM, Luciano Coelho wrote:
> On Wed, 2012-02-08 at 16:42 +0530, Shubhrajyoti Datta wrote:
>> On Wed, Feb 8, 2012 at 4:34 PM, Luciano Coelho<[email protected]> wrote:
>>> On Wed, 2012-02-08 at 12:59 +0200, Felipe Balbi wrote:
>>>> On Wed, Feb 08, 2012 at 12:56:52PM +0200, Luciano Coelho wrote:
>>>>> Since commit 6145197be6cc0583fa1a2f4ec1079d366137061e, building
>>>>
>>>> we generally like to see the commit subject here too. And adding the
>>>> abbreviated commit instead of the full sha1, wouldn't hurt either ;-)
>>>
>>> Ok, different practices. :)
>>
>> However there was already a discurssion.
>> Anyways thanks for the patch.
>> http://permalink.gmane.org/gmane.linux.ports.arm.omap/69796
>>
>>
>>>
>>> I'll send v2.
>> I think there was already a fix for this.
>>
>> http://www.spinics.net/lists/linux-omap/msg63151.html
>>
>> Anyways thanks for the patch.
>
> Ah, okay. Thanks for the info, I hadn't seen these.

Yeah, it looks like the OMAP fixes missed -rc2, but Tony sent the pull
request [1].

Regards,
Benoit

[1] http://www.spinics.net/lists/linux-omap/msg63564.html

2012-02-08 15:54:27

by Luciano Coelho

[permalink] [raw]
Subject: Re: [PATCH] I2C: OMAP: fix build breakage when CONFIG_OF is not set

Hi Benoit,

Ok, thanks. Good to know that the fixes are already queued.

On 2/8/12, Cousson, Benoit <[email protected]> wrote:
> Hi Luca,
>
> On 2/8/2012 12:25 PM, Luciano Coelho wrote:
>> On Wed, 2012-02-08 at 16:42 +0530, Shubhrajyoti Datta wrote:
>>> On Wed, Feb 8, 2012 at 4:34 PM, Luciano Coelho<[email protected]> wrote:
>>>> On Wed, 2012-02-08 at 12:59 +0200, Felipe Balbi wrote:
>>>>> On Wed, Feb 08, 2012 at 12:56:52PM +0200, Luciano Coelho wrote:
>>>>>> Since commit 6145197be6cc0583fa1a2f4ec1079d366137061e, building
>>>>>
>>>>> we generally like to see the commit subject here too. And adding the
>>>>> abbreviated commit instead of the full sha1, wouldn't hurt either ;-)
>>>>
>>>> Ok, different practices. :)
>>>
>>> However there was already a discurssion.
>>> Anyways thanks for the patch.
>>> http://permalink.gmane.org/gmane.linux.ports.arm.omap/69796
>>>
>>>
>>>>
>>>> I'll send v2.
>>> I think there was already a fix for this.
>>>
>>> http://www.spinics.net/lists/linux-omap/msg63151.html
>>>
>>> Anyways thanks for the patch.
>>
>> Ah, okay. Thanks for the info, I hadn't seen these.
>
> Yeah, it looks like the OMAP fixes missed -rc2, but Tony sent the pull
> request [1].
>
> Regards,
> Benoit
>
> [1] http://www.spinics.net/lists/linux-omap/msg63564.html
>


--
Cheers,
Luca.