[PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c

[PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c

[Michal Simek]

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

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

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

---
Changes in v3:
- Rebased on Pavel's UIO patch
  UIO: allow binding uio_pdrv_genirq.c to devices using command line option
  (sha1: 05c3e0bb5629b897b0459e4bfb1b93d729033b99)

Changes in v2:
- s/Use Use/Use/ from patch subject

 drivers/uio/uio_pdrv_genirq.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index bcd72f3..ad77450 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -274,8 +274,6 @@ MODULE_DEVICE_TABLE(of, uio_of_genirq_match);

 module_param_string(of_id, uio_of_genirq_match[0].compatible, 128, 0);
 MODULE_PARM_DESC(of_id, "Openfirmware id of the device to be handled by uio");
-#else
-# define uio_of_genirq_match NULL
 #endif

 static struct platform_driver uio_pdrv_genirq = {
@@ -285,7 +283,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.8.2.3


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

Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c

[Sachin Kamat]

On 26 June 2013 15:22, Michal Simek <michal.simek@xilinx.com> wrote:
> This eliminates having an #ifdef returning NULL for the case
> when OF is disabled.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>

I have already submitted a similar patch for doing this:
https://lkml.org/lkml/2013/3/14/169

-- 
With regards,
Sachin

Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c

[Michal Simek]

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

On 06/26/2013 12:00 PM, Sachin Kamat wrote:
> On 26 June 2013 15:22, Michal Simek <michal.simek@xilinx.com> wrote:
>> This eliminates having an #ifdef returning NULL for the case
>> when OF is disabled.
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> 
> I have already submitted a similar patch for doing this:
> https://lkml.org/lkml/2013/3/14/169

Ok. I don't care about it.
Greg: Can you please add any of this patch to your char-misc tree?

For Sachin patch.
Acked-by: Michal Simek <monstr@monstr.eu>

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c

[Sachin Kamat]

On 26 June 2013 15:51, Michal Simek <monstr@monstr.eu> wrote:
> On 06/26/2013 12:00 PM, Sachin Kamat wrote:
>> On 26 June 2013 15:22, Michal Simek <michal.simek@xilinx.com> wrote:
>>> This eliminates having an #ifdef returning NULL for the case
>>> when OF is disabled.
>>>
>>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>>
>> I have already submitted a similar patch for doing this:
>> https://lkml.org/lkml/2013/3/14/169
>
> Ok. I don't care about it.
> Greg: Can you please add any of this patch to your char-misc tree?
>
> For Sachin patch.
> Acked-by: Michal Simek <monstr@monstr.eu>

Thanks Michal. Since Hans wasn't active the patch has been pending
since some time.
The latest rebased version has been posted [1] for Greg to apply.

[1] https://lkml.org/lkml/2013/6/25/7

-- 
With warm regards,
Sachin

Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c

[Michal Simek]

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

On 06/26/2013 12:51 PM, Sachin Kamat wrote:
> On 26 June 2013 15:51, Michal Simek <monstr@monstr.eu> wrote:
>> On 06/26/2013 12:00 PM, Sachin Kamat wrote:
>>> On 26 June 2013 15:22, Michal Simek <michal.simek@xilinx.com> wrote:
>>>> This eliminates having an #ifdef returning NULL for the case
>>>> when OF is disabled.
>>>>
>>>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>>>
>>> I have already submitted a similar patch for doing this:
>>> https://lkml.org/lkml/2013/3/14/169
>>
>> Ok. I don't care about it.
>> Greg: Can you please add any of this patch to your char-misc tree?
>>
>> For Sachin patch.
>> Acked-by: Michal Simek <monstr@monstr.eu>
> 
> Thanks Michal. Since Hans wasn't active the patch has been pending
> since some time.
> The latest rebased version has been posted [1] for Greg to apply.
> 
> [1] https://lkml.org/lkml/2013/6/25/7


Yeah. As I said I really don't care which version will be applied.
It is just necessary to have progress on this.

Here is the first version I have sent
http://lkml.org/lkml/2013/5/23/311

btw: do you agree about removing that uio_pdrv because
all functionality is already in uio_pdrv_genirq driver
and make no sense to have two drivers for the same thing?

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c

[Sachin Kamat]

On 26 June 2013 16:34, Michal Simek <monstr@monstr.eu> wrote:
> On 06/26/2013 12:51 PM, Sachin Kamat wrote:
>> On 26 June 2013 15:51, Michal Simek <monstr@monstr.eu> wrote:
>>> On 06/26/2013 12:00 PM, Sachin Kamat wrote:
>>>> On 26 June 2013 15:22, Michal Simek <michal.simek@xilinx.com> wrote:
>>>>> This eliminates having an #ifdef returning NULL for the case
>>>>> when OF is disabled.
>>>>>
>>>>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>>>>
>>>> I have already submitted a similar patch for doing this:
>>>> https://lkml.org/lkml/2013/3/14/169
>>>
>>> Ok. I don't care about it.
>>> Greg: Can you please add any of this patch to your char-misc tree?
>>>
>>> For Sachin patch.
>>> Acked-by: Michal Simek <monstr@monstr.eu>
>>
>> Thanks Michal. Since Hans wasn't active the patch has been pending
>> since some time.
>> The latest rebased version has been posted [1] for Greg to apply.
>>
>> [1] https://lkml.org/lkml/2013/6/25/7
>
>
> Yeah. As I said I really don't care which version will be applied.
> It is just necessary to have progress on this.
>
> Here is the first version I have sent
> http://lkml.org/lkml/2013/5/23/311
>
> btw: do you agree about removing that uio_pdrv because
> all functionality is already in uio_pdrv_genirq driver
> and make no sense to have two drivers for the same thing?

Sorry, I have'nt  seen much of this code other than the obvious
cleanup for which I had sent the patch.

-- 
With warm regards,
Sachin

Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c

[Michal Simek]

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

On 06/26/2013 01:13 PM, Sachin Kamat wrote:
> On 26 June 2013 16:34, Michal Simek <monstr@monstr.eu> wrote:
>> On 06/26/2013 12:51 PM, Sachin Kamat wrote:
>>> On 26 June 2013 15:51, Michal Simek <monstr@monstr.eu> wrote:
>>>> On 06/26/2013 12:00 PM, Sachin Kamat wrote:
>>>>> On 26 June 2013 15:22, Michal Simek <michal.simek@xilinx.com> wrote:
>>>>>> This eliminates having an #ifdef returning NULL for the case
>>>>>> when OF is disabled.
>>>>>>
>>>>>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>>>>>
>>>>> I have already submitted a similar patch for doing this:
>>>>> https://lkml.org/lkml/2013/3/14/169
>>>>
>>>> Ok. I don't care about it.
>>>> Greg: Can you please add any of this patch to your char-misc tree?
>>>>
>>>> For Sachin patch.
>>>> Acked-by: Michal Simek <monstr@monstr.eu>
>>>
>>> Thanks Michal. Since Hans wasn't active the patch has been pending
>>> since some time.
>>> The latest rebased version has been posted [1] for Greg to apply.
>>>
>>> [1] https://lkml.org/lkml/2013/6/25/7
>>
>>
>> Yeah. As I said I really don't care which version will be applied.
>> It is just necessary to have progress on this.
>>
>> Here is the first version I have sent
>> http://lkml.org/lkml/2013/5/23/311
>>
>> btw: do you agree about removing that uio_pdrv because
>> all functionality is already in uio_pdrv_genirq driver
>> and make no sense to have two drivers for the same thing?
> 
> Sorry, I have'nt  seen much of this code other than the obvious
> cleanup for which I had sent the patch.

ok. Fair enough.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c

[Greg Kroah-Hartman]

On Wed, Jun 26, 2013 at 12:21:27PM +0200, Michal Simek wrote:
> On 06/26/2013 12:00 PM, Sachin Kamat wrote:
> > On 26 June 2013 15:22, Michal Simek <michal.simek@xilinx.com> wrote:
> >> This eliminates having an #ifdef returning NULL for the case
> >> when OF is disabled.
> >>
> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> > 
> > I have already submitted a similar patch for doing this:
> > https://lkml.org/lkml/2013/3/14/169
> 
> Ok. I don't care about it.
> Greg: Can you please add any of this patch to your char-misc tree?

I did that yesterday, can't you see it in there already, or did I mess
something up?

thanks,

greg k-h

Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c

[Michal Simek]

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

On 06/26/2013 05:00 PM, Greg Kroah-Hartman wrote:
> On Wed, Jun 26, 2013 at 12:21:27PM +0200, Michal Simek wrote:
>> On 06/26/2013 12:00 PM, Sachin Kamat wrote:
>>> On 26 June 2013 15:22, Michal Simek <michal.simek@xilinx.com> wrote:
>>>> This eliminates having an #ifdef returning NULL for the case
>>>> when OF is disabled.
>>>>
>>>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>>>
>>> I have already submitted a similar patch for doing this:
>>> https://lkml.org/lkml/2013/3/14/169
>>
>> Ok. I don't care about it.
>> Greg: Can you please add any of this patch to your char-misc tree?
> 
> I did that yesterday, can't you see it in there already, or did I mess
> something up?

You have applied
drivers: uio_dmem_genirq: Use of_match_ptr() macro
(sha1: 077797117dfa209717e1f3f1416c1101c0e047f0)

which is for uio_dmem_genirq.c
and there is one more for uio_pdrv_genirq.c driver
which we have talked about with Sachin.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c

[Greg Kroah-Hartman]

On Wed, Jun 26, 2013 at 05:06:32PM +0200, Michal Simek wrote:
> On 06/26/2013 05:00 PM, Greg Kroah-Hartman wrote:
> > On Wed, Jun 26, 2013 at 12:21:27PM +0200, Michal Simek wrote:
> >> On 06/26/2013 12:00 PM, Sachin Kamat wrote:
> >>> On 26 June 2013 15:22, Michal Simek <michal.simek@xilinx.com> wrote:
> >>>> This eliminates having an #ifdef returning NULL for the case
> >>>> when OF is disabled.
> >>>>
> >>>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> >>>
> >>> I have already submitted a similar patch for doing this:
> >>> https://lkml.org/lkml/2013/3/14/169
> >>
> >> Ok. I don't care about it.
> >> Greg: Can you please add any of this patch to your char-misc tree?
> > 
> > I did that yesterday, can't you see it in there already, or did I mess
> > something up?
> 
> You have applied
> drivers: uio_dmem_genirq: Use of_match_ptr() macro
> (sha1: 077797117dfa209717e1f3f1416c1101c0e047f0)
> 
> which is for uio_dmem_genirq.c
> and there is one more for uio_pdrv_genirq.c driver
> which we have talked about with Sachin.

Oops, I did mess up, I forgot to push that patch out publically, I did
apply it yesterday, thanks for making me check :)

greg k-h