All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c
@ 2013-06-26  9:52 Michal Simek
  2013-06-26  9:52 ` [PATCH v3 2/2] uio: Remove uio_pdrv and use uio_pdrv_genirq instead Michal Simek
  2013-06-26 10:00 ` [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c Sachin Kamat
  0 siblings, 2 replies; 16+ messages in thread
From: Michal Simek @ 2013-06-26  9:52 UTC (permalink / raw)
  To: linux-kernel
  Cc: Michal Simek, Michal Simek, Pavel Machek, Hans J. Koch,
	Greg Kroah-Hartman, Grant Likely, Rob Herring,
	devicetree-discuss

[-- 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 --]

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH v3 2/2] uio: Remove uio_pdrv and use uio_pdrv_genirq instead
  2013-06-26  9:52 [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c Michal Simek
@ 2013-06-26  9:52 ` Michal Simek
  2013-06-26 11:47   ` Vitalii Demianets
  2013-06-26 23:17   ` Pavel Machek
  2013-06-26 10:00 ` [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c Sachin Kamat
  1 sibling, 2 replies; 16+ messages in thread
From: Michal Simek @ 2013-06-26  9:52 UTC (permalink / raw)
  To: linux-kernel
  Cc: Michal Simek, Michal Simek, Pavel Machek, Hans J. Koch,
	Greg Kroah-Hartman

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

The patch "UIO: fix uio_pdrv_genirq with device tree but no interrupt"
(sha1: e3a3c3a205554e564751cd9c0276b2af813d7a92)
add support to use this driver with no interrupts.
uio_pdrv_genirq also supports device-tree binding
which is not available in uio_pdrv.

That's why this uio_pdrv driver can be just removed.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v3:
- Rebased on the latest char-misc with some UIO patches
- Change patch description

Changes in v2: None

 drivers/uio/Kconfig    |   7 ---
 drivers/uio/Makefile   |   1 -
 drivers/uio/uio_pdrv.c | 113 -------------------------------------------------
 3 files changed, 121 deletions(-)
 delete mode 100644 drivers/uio/uio_pdrv.c

diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index 5295be0..a81d163 100644
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -23,13 +23,6 @@ config UIO_CIF
 	  To compile this driver as a module, choose M here: the module
 	  will be called uio_cif.

-config UIO_PDRV
-	tristate "Userspace I/O platform driver"
-	help
-	  Generic platform driver for Userspace I/O devices.
-
-	  If you don't know what to do here, say N.
-
 config UIO_PDRV_GENIRQ
 	tristate "Userspace I/O platform driver with generic IRQ handling"
 	help
diff --git a/drivers/uio/Makefile b/drivers/uio/Makefile
index b354c53..ea015a2 100644
--- a/drivers/uio/Makefile
+++ b/drivers/uio/Makefile
@@ -1,6 +1,5 @@
 obj-$(CONFIG_UIO)	+= uio.o
 obj-$(CONFIG_UIO_CIF)	+= uio_cif.o
-obj-$(CONFIG_UIO_PDRV)	+= uio_pdrv.o
 obj-$(CONFIG_UIO_PDRV_GENIRQ)	+= uio_pdrv_genirq.o
 obj-$(CONFIG_UIO_DMEM_GENIRQ)	+= uio_dmem_genirq.o
 obj-$(CONFIG_UIO_AEC)	+= uio_aec.o
diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
deleted file mode 100644
index 39be9e0..0000000
--- a/drivers/uio/uio_pdrv.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * drivers/uio/uio_pdrv.c
- *
- * Copyright (C) 2008 by Digi International Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-#include <linux/platform_device.h>
-#include <linux/uio_driver.h>
-#include <linux/stringify.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-
-#define DRIVER_NAME "uio_pdrv"
-
-struct uio_platdata {
-	struct uio_info *uioinfo;
-};
-
-static int uio_pdrv_probe(struct platform_device *pdev)
-{
-	struct uio_info *uioinfo = pdev->dev.platform_data;
-	struct uio_platdata *pdata;
-	struct uio_mem *uiomem;
-	int ret = -ENODEV;
-	int i;
-
-	if (!uioinfo || !uioinfo->name || !uioinfo->version) {
-		dev_dbg(&pdev->dev, "%s: err_uioinfo\n", __func__);
-		goto err_uioinfo;
-	}
-
-	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
-	if (!pdata) {
-		ret = -ENOMEM;
-		dev_dbg(&pdev->dev, "%s: err_alloc_pdata\n", __func__);
-		goto err_alloc_pdata;
-	}
-
-	pdata->uioinfo = uioinfo;
-
-	uiomem = &uioinfo->mem[0];
-
-	for (i = 0; i < pdev->num_resources; ++i) {
-		struct resource *r = &pdev->resource[i];
-
-		if (r->flags != IORESOURCE_MEM)
-			continue;
-
-		if (uiomem >= &uioinfo->mem[MAX_UIO_MAPS]) {
-			dev_warn(&pdev->dev, "device has more than "
-					__stringify(MAX_UIO_MAPS)
-					" I/O memory resources.\n");
-			break;
-		}
-
-		uiomem->memtype = UIO_MEM_PHYS;
-		uiomem->addr = r->start;
-		uiomem->size = resource_size(r);
-		uiomem->name = r->name;
-		++uiomem;
-	}
-
-	while (uiomem < &uioinfo->mem[MAX_UIO_MAPS]) {
-		uiomem->size = 0;
-		++uiomem;
-	}
-
-	pdata->uioinfo->priv = pdata;
-
-	ret = uio_register_device(&pdev->dev, pdata->uioinfo);
-
-	if (ret) {
-		kfree(pdata);
-err_alloc_pdata:
-err_uioinfo:
-		return ret;
-	}
-
-	platform_set_drvdata(pdev, pdata);
-
-	return 0;
-}
-
-static int uio_pdrv_remove(struct platform_device *pdev)
-{
-	struct uio_platdata *pdata = platform_get_drvdata(pdev);
-
-	uio_unregister_device(pdata->uioinfo);
-
-	kfree(pdata);
-
-	return 0;
-}
-
-static struct platform_driver uio_pdrv = {
-	.probe = uio_pdrv_probe,
-	.remove = uio_pdrv_remove,
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-	},
-};
-
-module_platform_driver(uio_pdrv);
-
-MODULE_AUTHOR("Uwe Kleine-Koenig");
-MODULE_DESCRIPTION("Userspace I/O platform driver");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:" DRIVER_NAME);
--
1.8.2.3


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

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c
  2013-06-26  9:52 [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c Michal Simek
  2013-06-26  9:52 ` [PATCH v3 2/2] uio: Remove uio_pdrv and use uio_pdrv_genirq instead Michal Simek
@ 2013-06-26 10:00 ` Sachin Kamat
  2013-06-26 10:21   ` Michal Simek
  1 sibling, 1 reply; 16+ messages in thread
From: Sachin Kamat @ 2013-06-26 10:00 UTC (permalink / raw)
  To: Michal Simek
  Cc: linux-kernel, Michal Simek, Pavel Machek, Hans J. Koch,
	Greg Kroah-Hartman, Grant Likely, Rob Herring,
	devicetree-discuss

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c
  2013-06-26 10:00 ` [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c Sachin Kamat
@ 2013-06-26 10:21   ` Michal Simek
  2013-06-26 10:51     ` Sachin Kamat
  2013-06-26 15:00     ` Greg Kroah-Hartman
  0 siblings, 2 replies; 16+ messages in thread
From: Michal Simek @ 2013-06-26 10:21 UTC (permalink / raw)
  To: Sachin Kamat
  Cc: Michal Simek, linux-kernel, Pavel Machek, Hans J. Koch,
	Greg Kroah-Hartman, Grant Likely, Rob Herring,
	devicetree-discuss

[-- 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 --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c
  2013-06-26 10:21   ` Michal Simek
@ 2013-06-26 10:51     ` Sachin Kamat
  2013-06-26 11:04       ` Michal Simek
  2013-06-26 15:00     ` Greg Kroah-Hartman
  1 sibling, 1 reply; 16+ messages in thread
From: Sachin Kamat @ 2013-06-26 10:51 UTC (permalink / raw)
  To: monstr
  Cc: Michal Simek, linux-kernel, Pavel Machek, Hans J. Koch,
	Greg Kroah-Hartman, Grant Likely, Rob Herring,
	devicetree-discuss

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c
  2013-06-26 10:51     ` Sachin Kamat
@ 2013-06-26 11:04       ` Michal Simek
  2013-06-26 11:13         ` Sachin Kamat
  0 siblings, 1 reply; 16+ messages in thread
From: Michal Simek @ 2013-06-26 11:04 UTC (permalink / raw)
  To: Sachin Kamat
  Cc: Michal Simek, linux-kernel, Pavel Machek, Hans J. Koch,
	Greg Kroah-Hartman, Grant Likely, Rob Herring,
	devicetree-discuss

[-- 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 --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c
  2013-06-26 11:04       ` Michal Simek
@ 2013-06-26 11:13         ` Sachin Kamat
  2013-06-26 12:50           ` Michal Simek
  0 siblings, 1 reply; 16+ messages in thread
From: Sachin Kamat @ 2013-06-26 11:13 UTC (permalink / raw)
  To: monstr
  Cc: Michal Simek, linux-kernel, Pavel Machek, Hans J. Koch,
	Greg Kroah-Hartman, Grant Likely, Rob Herring,
	devicetree-discuss

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 2/2] uio: Remove uio_pdrv and use uio_pdrv_genirq instead
  2013-06-26  9:52 ` [PATCH v3 2/2] uio: Remove uio_pdrv and use uio_pdrv_genirq instead Michal Simek
@ 2013-06-26 11:47   ` Vitalii Demianets
  2013-06-26 23:17   ` Pavel Machek
  1 sibling, 0 replies; 16+ messages in thread
From: Vitalii Demianets @ 2013-06-26 11:47 UTC (permalink / raw)
  To: linux-kernel
  Cc: Michal Simek, Michal Simek, Pavel Machek, Hans J. Koch,
	Greg Kroah-Hartman

On Wednesday 26 June 2013 12:52:12 Michal Simek wrote:
> The patch "UIO: fix uio_pdrv_genirq with device tree but no interrupt"
> (sha1: e3a3c3a205554e564751cd9c0276b2af813d7a92)
> add support to use this driver with no interrupts.
> uio_pdrv_genirq also supports device-tree binding
> which is not available in uio_pdrv.
> 
> That's why this uio_pdrv driver can be just removed.
> 

The idea is sound and I like it - it removes a lot of duplicated code.

Reviewed-by: Vitalii Demianets <vitas@nppfactor.kiev.ua>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c
  2013-06-26 11:13         ` Sachin Kamat
@ 2013-06-26 12:50           ` Michal Simek
  0 siblings, 0 replies; 16+ messages in thread
From: Michal Simek @ 2013-06-26 12:50 UTC (permalink / raw)
  To: Sachin Kamat
  Cc: Michal Simek, linux-kernel, Pavel Machek, Hans J. Koch,
	Greg Kroah-Hartman, Grant Likely, Rob Herring,
	devicetree-discuss

[-- 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 --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c
  2013-06-26 10:21   ` Michal Simek
  2013-06-26 10:51     ` Sachin Kamat
@ 2013-06-26 15:00     ` Greg Kroah-Hartman
  2013-06-26 15:06       ` Michal Simek
  1 sibling, 1 reply; 16+ messages in thread
From: Greg Kroah-Hartman @ 2013-06-26 15:00 UTC (permalink / raw)
  To: Michal Simek
  Cc: Sachin Kamat, Michal Simek, linux-kernel, Pavel Machek,
	Hans J. Koch, Grant Likely, Rob Herring, devicetree-discuss

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c
  2013-06-26 15:00     ` Greg Kroah-Hartman
@ 2013-06-26 15:06       ` Michal Simek
  2013-06-26 17:12         ` Greg Kroah-Hartman
  0 siblings, 1 reply; 16+ messages in thread
From: Michal Simek @ 2013-06-26 15:06 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Sachin Kamat, Michal Simek, linux-kernel, Pavel Machek,
	Hans J. Koch, Grant Likely, Rob Herring, devicetree-discuss

[-- 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 --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c
  2013-06-26 15:06       ` Michal Simek
@ 2013-06-26 17:12         ` Greg Kroah-Hartman
  0 siblings, 0 replies; 16+ messages in thread
From: Greg Kroah-Hartman @ 2013-06-26 17:12 UTC (permalink / raw)
  To: Michal Simek
  Cc: Sachin Kamat, Michal Simek, linux-kernel, Pavel Machek,
	Hans J. Koch, Grant Likely, Rob Herring, devicetree-discuss

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 2/2] uio: Remove uio_pdrv and use uio_pdrv_genirq instead
  2013-06-26  9:52 ` [PATCH v3 2/2] uio: Remove uio_pdrv and use uio_pdrv_genirq instead Michal Simek
  2013-06-26 11:47   ` Vitalii Demianets
@ 2013-06-26 23:17   ` Pavel Machek
  2013-07-01  7:21     ` Michal Simek
  1 sibling, 1 reply; 16+ messages in thread
From: Pavel Machek @ 2013-06-26 23:17 UTC (permalink / raw)
  To: Michal Simek; +Cc: linux-kernel, Michal Simek, Hans J. Koch, Greg Kroah-Hartman

On Wed 2013-06-26 11:52:12, Michal Simek wrote:
> The patch "UIO: fix uio_pdrv_genirq with device tree but no interrupt"
> (sha1: e3a3c3a205554e564751cd9c0276b2af813d7a92)
> add support to use this driver with no interrupts.
> uio_pdrv_genirq also supports device-tree binding
> which is not available in uio_pdrv.
> 
> That's why this uio_pdrv driver can be just removed.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Reviewed-by: Pavel Machek <pavel@denx.de>

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 2/2] uio: Remove uio_pdrv and use uio_pdrv_genirq instead
  2013-06-26 23:17   ` Pavel Machek
@ 2013-07-01  7:21     ` Michal Simek
  2013-07-01 17:20       ` Greg Kroah-Hartman
  0 siblings, 1 reply; 16+ messages in thread
From: Michal Simek @ 2013-07-01  7:21 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: Pavel Machek, Michal Simek, linux-kernel, Hans J. Koch

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

Hi Greg,

On 06/27/2013 01:17 AM, Pavel Machek wrote:
> On Wed 2013-06-26 11:52:12, Michal Simek wrote:
>> The patch "UIO: fix uio_pdrv_genirq with device tree but no interrupt"
>> (sha1: e3a3c3a205554e564751cd9c0276b2af813d7a92)
>> add support to use this driver with no interrupts.
>> uio_pdrv_genirq also supports device-tree binding
>> which is not available in uio_pdrv.
>>
>> That's why this uio_pdrv driver can be just removed.
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> 
> Reviewed-by: Pavel Machek <pavel@denx.de>

I see 3.10 was tagged.
Are you going to add this patch to your char-misc tree?

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 --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 2/2] uio: Remove uio_pdrv and use uio_pdrv_genirq instead
  2013-07-01  7:21     ` Michal Simek
@ 2013-07-01 17:20       ` Greg Kroah-Hartman
  2013-07-03  6:00         ` Michal Simek
  0 siblings, 1 reply; 16+ messages in thread
From: Greg Kroah-Hartman @ 2013-07-01 17:20 UTC (permalink / raw)
  To: Michal Simek; +Cc: Pavel Machek, Michal Simek, linux-kernel, Hans J. Koch

On Mon, Jul 01, 2013 at 09:21:14AM +0200, Michal Simek wrote:
> Hi Greg,
> 
> On 06/27/2013 01:17 AM, Pavel Machek wrote:
> > On Wed 2013-06-26 11:52:12, Michal Simek wrote:
> >> The patch "UIO: fix uio_pdrv_genirq with device tree but no interrupt"
> >> (sha1: e3a3c3a205554e564751cd9c0276b2af813d7a92)
> >> add support to use this driver with no interrupts.
> >> uio_pdrv_genirq also supports device-tree binding
> >> which is not available in uio_pdrv.
> >>
> >> That's why this uio_pdrv driver can be just removed.
> >>
> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> > 
> > Reviewed-by: Pavel Machek <pavel@denx.de>
> 
> I see 3.10 was tagged.
> Are you going to add this patch to your char-misc tree?

I will consider it after 3.11-rc1 is out, it came too late in the 3.11
merge cycle for me to take it.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 2/2] uio: Remove uio_pdrv and use uio_pdrv_genirq instead
  2013-07-01 17:20       ` Greg Kroah-Hartman
@ 2013-07-03  6:00         ` Michal Simek
  0 siblings, 0 replies; 16+ messages in thread
From: Michal Simek @ 2013-07-03  6:00 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: Pavel Machek, Michal Simek, linux-kernel, Hans J. Koch

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

On 07/01/2013 07:20 PM, Greg Kroah-Hartman wrote:
> On Mon, Jul 01, 2013 at 09:21:14AM +0200, Michal Simek wrote:
>> Hi Greg,
>>
>> On 06/27/2013 01:17 AM, Pavel Machek wrote:
>>> On Wed 2013-06-26 11:52:12, Michal Simek wrote:
>>>> The patch "UIO: fix uio_pdrv_genirq with device tree but no interrupt"
>>>> (sha1: e3a3c3a205554e564751cd9c0276b2af813d7a92)
>>>> add support to use this driver with no interrupts.
>>>> uio_pdrv_genirq also supports device-tree binding
>>>> which is not available in uio_pdrv.
>>>>
>>>> That's why this uio_pdrv driver can be just removed.
>>>>
>>>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>>>
>>> Reviewed-by: Pavel Machek <pavel@denx.de>
>>
>> I see 3.10 was tagged.
>> Are you going to add this patch to your char-misc tree?
> 
> I will consider it after 3.11-rc1 is out, it came too late in the 3.11
> merge cycle for me to take it.

No problem. I will keep my eyes on it.

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 --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2013-07-03  6:00 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-26  9:52 [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c Michal Simek
2013-06-26  9:52 ` [PATCH v3 2/2] uio: Remove uio_pdrv and use uio_pdrv_genirq instead Michal Simek
2013-06-26 11:47   ` Vitalii Demianets
2013-06-26 23:17   ` Pavel Machek
2013-07-01  7:21     ` Michal Simek
2013-07-01 17:20       ` Greg Kroah-Hartman
2013-07-03  6:00         ` Michal Simek
2013-06-26 10:00 ` [PATCH v3 1/2] uio: Use of_match_ptr() macro in uio_pdrv_genirq.c Sachin Kamat
2013-06-26 10:21   ` Michal Simek
2013-06-26 10:51     ` Sachin Kamat
2013-06-26 11:04       ` Michal Simek
2013-06-26 11:13         ` Sachin Kamat
2013-06-26 12:50           ` Michal Simek
2013-06-26 15:00     ` Greg Kroah-Hartman
2013-06-26 15:06       ` Michal Simek
2013-06-26 17:12         ` Greg Kroah-Hartman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.