[PATCH 1/2] drivers: uio_dmem_genirq: Use of_match_ptr() macro

[PATCH 1/2] drivers: uio_dmem_genirq: Use of_match_ptr() macro

[Sachin Kamat]

This eliminates having an #ifdef returning NULL for the case
when OF is disabled.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Damian Hobson-Garcia <dhobsong@igel.co.jp>
---
 drivers/uio/uio_dmem_genirq.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c
index 252434c..125d0e5 100644
--- a/drivers/uio/uio_dmem_genirq.c
+++ b/drivers/uio/uio_dmem_genirq.c
@@ -336,8 +336,6 @@ static const struct of_device_id uio_of_genirq_match[] = {
 	{ /* empty for now */ },
 };
 MODULE_DEVICE_TABLE(of, uio_of_genirq_match);
-#else
-# define uio_of_genirq_match NULL
 #endif
 
 static struct platform_driver uio_dmem_genirq = {
@@ -347,7 +345,7 @@ static struct platform_driver uio_dmem_genirq = {
 		.name = DRIVER_NAME,
 		.owner = THIS_MODULE,
 		.pm = &uio_dmem_genirq_dev_pm_ops,
-		.of_match_table = uio_of_genirq_match,
+		.of_match_table = of_match_ptr(uio_of_genirq_match),
 	},
 };
 
-- 
1.7.4.1

[PATCH 2/2] drivers: uio_pdrv_genirq: Use of_match_ptr() macro

[Sachin Kamat]

This eliminates having an #ifdef returning NULL for the case
when OF is disabled.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/uio/uio_pdrv_genirq.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index c122bca..d7ba355 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -267,8 +267,6 @@ static const struct of_device_id uio_of_genirq_match[] = {
 	{ /* empty for now */ },
 };
 MODULE_DEVICE_TABLE(of, uio_of_genirq_match);
-#else
-# define uio_of_genirq_match NULL
 #endif
 
 static struct platform_driver uio_pdrv_genirq = {
@@ -278,7 +276,7 @@ static struct platform_driver uio_pdrv_genirq = {
 		.name = DRIVER_NAME,
 		.owner = THIS_MODULE,
 		.pm = &uio_pdrv_genirq_dev_pm_ops,
-		.of_match_table = uio_of_genirq_match,
+		.of_match_table = of_match_ptr(uio_of_genirq_match),
 	},
 };
 
-- 
1.7.4.1

Re: [PATCH 1/2] drivers: uio_dmem_genirq: Use of_match_ptr() macro

[Damian Hobson-Garcia]

On 2013/03/14 19:22, Sachin Kamat wrote:
> This eliminates having an #ifdef returning NULL for the case
> when OF is disabled.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Damian Hobson-Garcia <dhobsong@igel.co.jp>
> ---
Thank you,
Looks fine by me.

Acked-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>

Re: [PATCH 1/2] drivers: uio_dmem_genirq: Use of_match_ptr() macro

[Sachin Kamat]

On 19 March 2013 06:50, Damian Hobson-Garcia <dhobsong@igel.co.jp> wrote:
> On 2013/03/14 19:22, Sachin Kamat wrote:
>>
>> This eliminates having an #ifdef returning NULL for the case
>> when OF is disabled.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> Cc: Damian Hobson-Garcia <dhobsong@igel.co.jp>
>> ---
>
> Thank you,
> Looks fine by me.
>
> Acked-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>

Hans,

Would you be picking up these patches for 3.10?


-- 
With warm regards,
Sachin