* [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
@ 2012-01-22 11:02 ` Paul Walmsley
0 siblings, 0 replies; 22+ messages in thread
From: Paul Walmsley @ 2012-01-22 11:02 UTC (permalink / raw)
To: linux-arm-kernel
Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
support for i2c controller") breaks compilation when CONFIG_OF is not
defined:
CC drivers/i2c/busses/i2c-omap.o
drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in
Fix this by avoiding of_*() functions when !CONFIG_OF.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
---
drivers/i2c/busses/i2c-omap.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index f713eac..1008e96 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -989,7 +989,7 @@ omap_i2c_probe(struct platform_device *pdev)
struct resource *mem, *irq, *ioarea;
struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
struct device_node *node = pdev->dev.of_node;
- const struct of_device_id *match;
+ const struct of_device_id *match = NULL;
irq_handler_t isr;
int r;
@@ -1018,7 +1018,9 @@ omap_i2c_probe(struct platform_device *pdev)
goto err_release_region;
}
+#ifdef CONFIG_OF
match = of_match_device(omap_i2c_of_match, &pdev->dev);
+#endif
if (match) {
u32 freq = 100000; /* default to 100000 Hz */
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
2012-01-22 11:02 ` Paul Walmsley
@ 2012-01-22 15:40 ` Rob Herring
-1 siblings, 0 replies; 22+ messages in thread
From: Rob Herring @ 2012-01-22 15:40 UTC (permalink / raw)
To: Paul Walmsley
Cc: linux-omap, linux-arm-kernel, Grant Likely, Kevin Hilman,
Tony Lindgren, Benoit Cousson, Rob Herring
On 01/22/2012 05:02 AM, Paul Walmsley wrote:
> Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
> support for i2c controller") breaks compilation when CONFIG_OF is not
> defined:
>
> CC drivers/i2c/busses/i2c-omap.o
> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
> drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
> drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in
>
> Fix this by avoiding of_*() functions when !CONFIG_OF.
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Benoit Cousson <b-cousson@ti.com>
> Cc: Rob Herring <rob.herring@calxeda.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Kevin Hilman <khilman@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> ---
> drivers/i2c/busses/i2c-omap.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index f713eac..1008e96 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -989,7 +989,7 @@ omap_i2c_probe(struct platform_device *pdev)
> struct resource *mem, *irq, *ioarea;
> struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
> struct device_node *node = pdev->dev.of_node;
> - const struct of_device_id *match;
> + const struct of_device_id *match = NULL;
> irq_handler_t isr;
> int r;
>
> @@ -1018,7 +1018,9 @@ omap_i2c_probe(struct platform_device *pdev)
> goto err_release_region;
> }
>
> +#ifdef CONFIG_OF
> match = of_match_device(omap_i2c_of_match, &pdev->dev);
> +#endif
How about an empty function for of_match_device instead to avoid the ifdef.
Rob
> if (match) {
> u32 freq = 100000; /* default to 100000 Hz */
>
>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
@ 2012-01-22 15:40 ` Rob Herring
0 siblings, 0 replies; 22+ messages in thread
From: Rob Herring @ 2012-01-22 15:40 UTC (permalink / raw)
To: linux-arm-kernel
On 01/22/2012 05:02 AM, Paul Walmsley wrote:
> Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
> support for i2c controller") breaks compilation when CONFIG_OF is not
> defined:
>
> CC drivers/i2c/busses/i2c-omap.o
> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
> drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
> drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in
>
> Fix this by avoiding of_*() functions when !CONFIG_OF.
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Benoit Cousson <b-cousson@ti.com>
> Cc: Rob Herring <rob.herring@calxeda.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Kevin Hilman <khilman@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> ---
> drivers/i2c/busses/i2c-omap.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index f713eac..1008e96 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -989,7 +989,7 @@ omap_i2c_probe(struct platform_device *pdev)
> struct resource *mem, *irq, *ioarea;
> struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
> struct device_node *node = pdev->dev.of_node;
> - const struct of_device_id *match;
> + const struct of_device_id *match = NULL;
> irq_handler_t isr;
> int r;
>
> @@ -1018,7 +1018,9 @@ omap_i2c_probe(struct platform_device *pdev)
> goto err_release_region;
> }
>
> +#ifdef CONFIG_OF
> match = of_match_device(omap_i2c_of_match, &pdev->dev);
> +#endif
How about an empty function for of_match_device instead to avoid the ifdef.
Rob
> if (match) {
> u32 freq = 100000; /* default to 100000 Hz */
>
>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
2012-01-22 15:40 ` Rob Herring
@ 2012-01-22 15:46 ` Grant Likely
-1 siblings, 0 replies; 22+ messages in thread
From: Grant Likely @ 2012-01-22 15:46 UTC (permalink / raw)
To: Rob Herring
Cc: Paul Walmsley, linux-omap, linux-arm-kernel, Kevin Hilman,
Tony Lindgren, Benoit Cousson, Rob Herring
On Sun, Jan 22, 2012 at 8:40 AM, Rob Herring <robherring2@gmail.com> wrote:
> On 01/22/2012 05:02 AM, Paul Walmsley wrote:
>> Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
>> support for i2c controller") breaks compilation when CONFIG_OF is not
>> defined:
>>
>> CC drivers/i2c/busses/i2c-omap.o
>> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
>> drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
>> drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in
>>
>> Fix this by avoiding of_*() functions when !CONFIG_OF.
>>
>> Signed-off-by: Paul Walmsley <paul@pwsan.com>
>> Cc: Benoit Cousson <b-cousson@ti.com>
>> Cc: Rob Herring <rob.herring@calxeda.com>
>> Cc: Grant Likely <grant.likely@secretlab.ca>
>> Cc: Kevin Hilman <khilman@ti.com>
>> Cc: Tony Lindgren <tony@atomide.com>
>> ---
>> drivers/i2c/busses/i2c-omap.c | 4 +++-
>> 1 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
>> index f713eac..1008e96 100644
>> --- a/drivers/i2c/busses/i2c-omap.c
>> +++ b/drivers/i2c/busses/i2c-omap.c
>> @@ -989,7 +989,7 @@ omap_i2c_probe(struct platform_device *pdev)
>> struct resource *mem, *irq, *ioarea;
>> struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
>> struct device_node *node = pdev->dev.of_node;
>> - const struct of_device_id *match;
>> + const struct of_device_id *match = NULL;
>> irq_handler_t isr;
>> int r;
>>
>> @@ -1018,7 +1018,9 @@ omap_i2c_probe(struct platform_device *pdev)
>> goto err_release_region;
>> }
>>
>> +#ifdef CONFIG_OF
>> match = of_match_device(omap_i2c_of_match, &pdev->dev);
>> +#endif
>
> How about an empty function for of_match_device instead to avoid the ifdef.
That already exists. The problem is the undefined omap_i2c_of_match
table reference.
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
@ 2012-01-22 15:46 ` Grant Likely
0 siblings, 0 replies; 22+ messages in thread
From: Grant Likely @ 2012-01-22 15:46 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jan 22, 2012 at 8:40 AM, Rob Herring <robherring2@gmail.com> wrote:
> On 01/22/2012 05:02 AM, Paul Walmsley wrote:
>> Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
>> support for i2c controller") breaks compilation when CONFIG_OF is not
>> defined:
>>
>> ? CC ? ? ?drivers/i2c/busses/i2c-omap.o
>> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
>> drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
>> drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in
>>
>> Fix this by avoiding of_*() functions when !CONFIG_OF.
>>
>> Signed-off-by: Paul Walmsley <paul@pwsan.com>
>> Cc: Benoit Cousson <b-cousson@ti.com>
>> Cc: Rob Herring <rob.herring@calxeda.com>
>> Cc: Grant Likely <grant.likely@secretlab.ca>
>> Cc: Kevin Hilman <khilman@ti.com>
>> Cc: Tony Lindgren <tony@atomide.com>
>> ---
>> ?drivers/i2c/busses/i2c-omap.c | ? ?4 +++-
>> ?1 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
>> index f713eac..1008e96 100644
>> --- a/drivers/i2c/busses/i2c-omap.c
>> +++ b/drivers/i2c/busses/i2c-omap.c
>> @@ -989,7 +989,7 @@ omap_i2c_probe(struct platform_device *pdev)
>> ? ? ? struct resource ? ? ? ? *mem, *irq, *ioarea;
>> ? ? ? struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
>> ? ? ? struct device_node ? ? ?*node = pdev->dev.of_node;
>> - ? ? const struct of_device_id *match;
>> + ? ? const struct of_device_id *match = NULL;
>> ? ? ? irq_handler_t isr;
>> ? ? ? int r;
>>
>> @@ -1018,7 +1018,9 @@ omap_i2c_probe(struct platform_device *pdev)
>> ? ? ? ? ? ? ? goto err_release_region;
>> ? ? ? }
>>
>> +#ifdef CONFIG_OF
>> ? ? ? match = of_match_device(omap_i2c_of_match, &pdev->dev);
>> +#endif
>
> How about an empty function for of_match_device instead to avoid the ifdef.
That already exists. The problem is the undefined omap_i2c_of_match
table reference.
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
2012-01-22 11:02 ` Paul Walmsley
@ 2012-01-22 15:45 ` Grant Likely
-1 siblings, 0 replies; 22+ messages in thread
From: Grant Likely @ 2012-01-22 15:45 UTC (permalink / raw)
To: Paul Walmsley
Cc: linux-omap, linux-arm-kernel, Kevin Hilman, Tony Lindgren,
Benoit Cousson, Rob Herring
On Sun, Jan 22, 2012 at 04:02:33AM -0700, Paul Walmsley wrote:
> Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
> support for i2c controller") breaks compilation when CONFIG_OF is not
> defined:
>
> CC drivers/i2c/busses/i2c-omap.o
> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
> drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
> drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in
>
> Fix this by avoiding of_*() functions when !CONFIG_OF.
To avoid #ifdef blocks, how about one of these fixes instead?
of_match_device resolves to a static inline NULL when CONFIG_OF is not
selected.
g.
---
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index f713eac..c22e51f 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
+#define omap_i2c_of_match NULL
#endif
static int __devinit
Or alternately:
---
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index f713eac..801df60 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1018,7 +1018,7 @@ omap_i2c_probe(struct platform_device *pdev)
goto err_release_region;
}
- match = of_match_device(omap_i2c_of_match, &pdev->dev);
+ match = of_match_device(of_match_ptr(omap_i2c_of_match), &pdev->dev);
if (match) {
u32 freq = 100000; /* default to 100000 Hz */
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
@ 2012-01-22 15:45 ` Grant Likely
0 siblings, 0 replies; 22+ messages in thread
From: Grant Likely @ 2012-01-22 15:45 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jan 22, 2012 at 04:02:33AM -0700, Paul Walmsley wrote:
> Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
> support for i2c controller") breaks compilation when CONFIG_OF is not
> defined:
>
> CC drivers/i2c/busses/i2c-omap.o
> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
> drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
> drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in
>
> Fix this by avoiding of_*() functions when !CONFIG_OF.
To avoid #ifdef blocks, how about one of these fixes instead?
of_match_device resolves to a static inline NULL when CONFIG_OF is not
selected.
g.
---
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index f713eac..c22e51f 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
+#define omap_i2c_of_match NULL
#endif
static int __devinit
Or alternately:
---
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index f713eac..801df60 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1018,7 +1018,7 @@ omap_i2c_probe(struct platform_device *pdev)
goto err_release_region;
}
- match = of_match_device(omap_i2c_of_match, &pdev->dev);
+ match = of_match_device(of_match_ptr(omap_i2c_of_match), &pdev->dev);
if (match) {
u32 freq = 100000; /* default to 100000 Hz */
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
2012-01-22 15:45 ` Grant Likely
@ 2012-01-22 16:06 ` Rob Herring
-1 siblings, 0 replies; 22+ messages in thread
From: Rob Herring @ 2012-01-22 16:06 UTC (permalink / raw)
To: Grant Likely
Cc: Paul Walmsley, linux-omap, linux-arm-kernel, Kevin Hilman,
Tony Lindgren, Benoit Cousson
On 01/22/2012 09:45 AM, Grant Likely wrote:
> On Sun, Jan 22, 2012 at 04:02:33AM -0700, Paul Walmsley wrote:
>> Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
>> support for i2c controller") breaks compilation when CONFIG_OF is not
>> defined:
>>
>> CC drivers/i2c/busses/i2c-omap.o
>> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
>> drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
>> drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in
>>
>> Fix this by avoiding of_*() functions when !CONFIG_OF.
>
> To avoid #ifdef blocks, how about one of these fixes instead?
> of_match_device resolves to a static inline NULL when CONFIG_OF is not
> selected.
>
> g.
>
> ---
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index f713eac..c22e51f 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
> +#define omap_i2c_of_match NULL
> #endif
Or just remove the existing ifdef. Isn't OMAP going to be completely
converted to DT?
I think building CONFIG_OF and !CONFIG_OF and running non-DT machines
with OF enabled is going to be a constant source of breakage. We should
move selecting CONFIG_OF up from boards/SOC config to family config
(i.e. all OMAP).
Rob
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
@ 2012-01-22 16:06 ` Rob Herring
0 siblings, 0 replies; 22+ messages in thread
From: Rob Herring @ 2012-01-22 16:06 UTC (permalink / raw)
To: linux-arm-kernel
On 01/22/2012 09:45 AM, Grant Likely wrote:
> On Sun, Jan 22, 2012 at 04:02:33AM -0700, Paul Walmsley wrote:
>> Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
>> support for i2c controller") breaks compilation when CONFIG_OF is not
>> defined:
>>
>> CC drivers/i2c/busses/i2c-omap.o
>> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
>> drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
>> drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in
>>
>> Fix this by avoiding of_*() functions when !CONFIG_OF.
>
> To avoid #ifdef blocks, how about one of these fixes instead?
> of_match_device resolves to a static inline NULL when CONFIG_OF is not
> selected.
>
> g.
>
> ---
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index f713eac..c22e51f 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
> +#define omap_i2c_of_match NULL
> #endif
Or just remove the existing ifdef. Isn't OMAP going to be completely
converted to DT?
I think building CONFIG_OF and !CONFIG_OF and running non-DT machines
with OF enabled is going to be a constant source of breakage. We should
move selecting CONFIG_OF up from boards/SOC config to family config
(i.e. all OMAP).
Rob
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
2012-01-22 16:06 ` Rob Herring
@ 2012-01-22 16:59 ` Cousson, Benoit
-1 siblings, 0 replies; 22+ messages in thread
From: Cousson, Benoit @ 2012-01-22 16:59 UTC (permalink / raw)
To: Rob Herring
Cc: Grant Likely, Paul Walmsley, linux-omap, linux-arm-kernel,
Kevin Hilman, Tony Lindgren
On 1/22/2012 5:06 PM, Rob Herring wrote:
> On 01/22/2012 09:45 AM, Grant Likely wrote:
>> On Sun, Jan 22, 2012 at 04:02:33AM -0700, Paul Walmsley wrote:
>>> Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
>>> support for i2c controller") breaks compilation when CONFIG_OF is not
>>> defined:
>>>
>>> CC drivers/i2c/busses/i2c-omap.o
>>> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
>>> drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
>>> drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in
>>>
>>> Fix this by avoiding of_*() functions when !CONFIG_OF.
>>
>> To avoid #ifdef blocks, how about one of these fixes instead?
>> of_match_device resolves to a static inline NULL when CONFIG_OF is not
>> selected.
>>
>> g.
>>
>> ---
>> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
>> index f713eac..c22e51f 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
>> +#define omap_i2c_of_match NULL
>> #endif
>
> Or just remove the existing ifdef. Isn't OMAP going to be completely
> converted to DT?
>
> I think building CONFIG_OF and !CONFIG_OF and running non-DT machines
> with OF enabled is going to be a constant source of breakage. We should
> move selecting CONFIG_OF up from boards/SOC config to family config
> (i.e. all OMAP).
Yep, I do agree, and even sent a patch for that.
http://lists.ozlabs.org/pipermail/devicetree-discuss/2011-December/010541.html
But it looks like it was stuck in linux-omap dt branch and not pulled
for 3.3. Maybe Tony can try to sent it during -rc phase.
That being said, this will be valid for OMAP2+ only and will still break
OMAP1 platform :-(
Tony reported that 2 days ago, and I sent the fix for it.
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg61520.html
It is now waiting for Ben's Acked-by.
Regards,
Benoit
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
@ 2012-01-22 16:59 ` Cousson, Benoit
0 siblings, 0 replies; 22+ messages in thread
From: Cousson, Benoit @ 2012-01-22 16:59 UTC (permalink / raw)
To: linux-arm-kernel
On 1/22/2012 5:06 PM, Rob Herring wrote:
> On 01/22/2012 09:45 AM, Grant Likely wrote:
>> On Sun, Jan 22, 2012 at 04:02:33AM -0700, Paul Walmsley wrote:
>>> Commit 6145197be6cc0583fa1a2f4ec1079d366137061e ("i2c: OMAP: Add DT
>>> support for i2c controller") breaks compilation when CONFIG_OF is not
>>> defined:
>>>
>>> CC drivers/i2c/busses/i2c-omap.o
>>> drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
>>> drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
>>> drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in
>>>
>>> Fix this by avoiding of_*() functions when !CONFIG_OF.
>>
>> To avoid #ifdef blocks, how about one of these fixes instead?
>> of_match_device resolves to a static inline NULL when CONFIG_OF is not
>> selected.
>>
>> g.
>>
>> ---
>> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
>> index f713eac..c22e51f 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
>> +#define omap_i2c_of_match NULL
>> #endif
>
> Or just remove the existing ifdef. Isn't OMAP going to be completely
> converted to DT?
>
> I think building CONFIG_OF and !CONFIG_OF and running non-DT machines
> with OF enabled is going to be a constant source of breakage. We should
> move selecting CONFIG_OF up from boards/SOC config to family config
> (i.e. all OMAP).
Yep, I do agree, and even sent a patch for that.
http://lists.ozlabs.org/pipermail/devicetree-discuss/2011-December/010541.html
But it looks like it was stuck in linux-omap dt branch and not pulled
for 3.3. Maybe Tony can try to sent it during -rc phase.
That being said, this will be valid for OMAP2+ only and will still break
OMAP1 platform :-(
Tony reported that 2 days ago, and I sent the fix for it.
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg61520.html
It is now waiting for Ben's Acked-by.
Regards,
Benoit
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
2012-01-22 16:59 ` Cousson, Benoit
@ 2012-01-22 19:54 ` Paul Walmsley
-1 siblings, 0 replies; 22+ messages in thread
From: Paul Walmsley @ 2012-01-22 19:54 UTC (permalink / raw)
To: linux-omap, linux-arm-kernel
Cc: Cousson, Benoit, Rob Herring, Grant Likely, Kevin Hilman,
Tony Lindgren, khali, ben-linux
cc Ben, Jean
On Sun, 22 Jan 2012, Cousson, Benoit wrote:
> http://lists.ozlabs.org/pipermail/devicetree-discuss/2011-December/010541.html
>
> But it looks like it was stuck in linux-omap dt branch and not pulled for 3.3.
> Maybe Tony can try to sent it during -rc phase.
>
> That being said, this will be valid for OMAP2+ only and will still break OMAP1
> platform :-(
>
> Tony reported that 2 days ago, and I sent the fix for it.
> http://www.mail-archive.com/linux-omap@vger.kernel.org/msg61520.html
Will drop patch 3 from my series. Incidentally, it doesn't seem necessary
to wait for Ben's ack after commit
046d0a37024a5b1e66ec9314e5e7feba42feb811 ("ARM: OMAP: I2C: fix compilation
when !CONFIG_OF"), unless Ben disagrees with that change.
- Paul
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
@ 2012-01-22 19:54 ` Paul Walmsley
0 siblings, 0 replies; 22+ messages in thread
From: Paul Walmsley @ 2012-01-22 19:54 UTC (permalink / raw)
To: linux-arm-kernel
cc Ben, Jean
On Sun, 22 Jan 2012, Cousson, Benoit wrote:
> http://lists.ozlabs.org/pipermail/devicetree-discuss/2011-December/010541.html
>
> But it looks like it was stuck in linux-omap dt branch and not pulled for 3.3.
> Maybe Tony can try to sent it during -rc phase.
>
> That being said, this will be valid for OMAP2+ only and will still break OMAP1
> platform :-(
>
> Tony reported that 2 days ago, and I sent the fix for it.
> http://www.mail-archive.com/linux-omap at vger.kernel.org/msg61520.html
Will drop patch 3 from my series. Incidentally, it doesn't seem necessary
to wait for Ben's ack after commit
046d0a37024a5b1e66ec9314e5e7feba42feb811 ("ARM: OMAP: I2C: fix compilation
when !CONFIG_OF"), unless Ben disagrees with that change.
- Paul
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
2012-01-22 19:54 ` Paul Walmsley
@ 2012-01-22 20:07 ` Jean Delvare
-1 siblings, 0 replies; 22+ messages in thread
From: Jean Delvare @ 2012-01-22 20:07 UTC (permalink / raw)
To: Paul Walmsley
Cc: linux-omap, linux-arm-kernel, Cousson, Benoit, Rob Herring,
Grant Likely, Kevin Hilman, Tony Lindgren, ben-linux
On Sun, 22 Jan 2012 12:54:21 -0700 (MST), Paul Walmsley wrote:
> cc Ben, Jean
I'm not involved in this at all.
Jean
>
> On Sun, 22 Jan 2012, Cousson, Benoit wrote:
>
> > http://lists.ozlabs.org/pipermail/devicetree-discuss/2011-December/010541.html
> >
> > But it looks like it was stuck in linux-omap dt branch and not pulled for 3.3.
> > Maybe Tony can try to sent it during -rc phase.
> >
> > That being said, this will be valid for OMAP2+ only and will still break OMAP1
> > platform :-(
> >
> > Tony reported that 2 days ago, and I sent the fix for it.
> > http://www.mail-archive.com/linux-omap@vger.kernel.org/msg61520.html
>
> Will drop patch 3 from my series. Incidentally, it doesn't seem necessary
> to wait for Ben's ack after commit
> 046d0a37024a5b1e66ec9314e5e7feba42feb811 ("ARM: OMAP: I2C: fix compilation
> when !CONFIG_OF"), unless Ben disagrees with that change.
>
>
> - Paul
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 3/3] ARM: OMAP: I2C: fix compilation when !CONFIG_OF
@ 2012-01-22 20:07 ` Jean Delvare
0 siblings, 0 replies; 22+ messages in thread
From: Jean Delvare @ 2012-01-22 20:07 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, 22 Jan 2012 12:54:21 -0700 (MST), Paul Walmsley wrote:
> cc Ben, Jean
I'm not involved in this at all.
Jean
>
> On Sun, 22 Jan 2012, Cousson, Benoit wrote:
>
> > http://lists.ozlabs.org/pipermail/devicetree-discuss/2011-December/010541.html
> >
> > But it looks like it was stuck in linux-omap dt branch and not pulled for 3.3.
> > Maybe Tony can try to sent it during -rc phase.
> >
> > That being said, this will be valid for OMAP2+ only and will still break OMAP1
> > platform :-(
> >
> > Tony reported that 2 days ago, and I sent the fix for it.
> > http://www.mail-archive.com/linux-omap at vger.kernel.org/msg61520.html
>
> Will drop patch 3 from my series. Incidentally, it doesn't seem necessary
> to wait for Ben's ack after commit
> 046d0a37024a5b1e66ec9314e5e7feba42feb811 ("ARM: OMAP: I2C: fix compilation
> when !CONFIG_OF"), unless Ben disagrees with that change.
>
>
> - Paul
^ permalink raw reply [flat|nested] 22+ messages in thread