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

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

[Luciano Coelho]

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 <b-cousson@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
---
 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

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

[Felipe Balbi]

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

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 <b-cousson@ti.com>
> Signed-off-by: Luciano Coelho <coelho@ti.com>

after fixing the commit log, you can add:

Reviewed-by: Felipe Balbi <balbi@ti.com>

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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

-- 
balbi

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

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

[Luciano Coelho]

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 <b-cousson@ti.com>
> Signed-off-by: Luciano Coelho <coelho@ti.com>
> ---

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

-- 
Cheers,
Luca.

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

[Luciano Coelho]

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 <b-cousson@ti.com>
> > Signed-off-by: Luciano Coelho <coelho@ti.com>
> 
> after fixing the commit log, you can add:
> 
> Reviewed-by: Felipe Balbi <balbi@ti.com>
> 
> if you want.

Thanks for your quick review!

-- 
Cheers,
Luca.

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

[Shubhrajyoti Datta]

On Wed, Feb 8, 2012 at 4:34 PM, Luciano Coelho <coelho@ti.com> 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 <b-cousson@ti.com>
>> > Signed-off-by: Luciano Coelho <coelho@ti.com>
>>
>> after fixing the commit log, you can add:
>>
>> Reviewed-by: Felipe Balbi <balbi@ti.com>
>>
>> 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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Luciano Coelho]

On Wed, 2012-02-08 at 16:42 +0530, Shubhrajyoti Datta wrote: 
> On Wed, Feb 8, 2012 at 4:34 PM, Luciano Coelho <coelho@ti.com> 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.

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

[Cousson, Benoit]

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<coelho@ti.com>  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

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

[Coelho, Luciano]

Hi Benoit,

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

On 2/8/12, Cousson, Benoit <b-cousson@ti.com> 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<coelho@ti.com>  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.