[PATCH 1/3] video: exynos_mipi_dsi: Convert to devm_ioremap_resource()

[PATCH 1/3] video: exynos_mipi_dsi: Convert to devm_ioremap_resource()

[Sachin Kamat]

Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Donghwa Lee <dh09.lee@samsung.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: linux-fbdev@vger.kernel.org
---
 drivers/video/exynos/exynos_mipi_dsi.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index fac7df6..a29715f 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -32,6 +32,7 @@
 #include <linux/notifier.h>
 #include <linux/regulator/consumer.h>
 #include <linux/pm_runtime.h>
+#include <linux/err.h>
 
 #include <video/exynos_mipi_dsim.h>
 
@@ -384,10 +385,10 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-	dsim->reg_base = devm_request_and_ioremap(&pdev->dev, res);
-	if (!dsim->reg_base) {
+	dsim->reg_base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(dsim->reg_base)) {
 		dev_err(&pdev->dev, "failed to remap io region\n");
-		ret = -ENOMEM;
+		ret = PTR_ERR(dsim->reg_base);
 		goto error;
 	}
 
-- 
1.7.4.1

[PATCH 2/3] Input: tegra-kbc- Convert to devm_ioremap_resource()

[Sachin Kamat]

Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
---
Compile tested with linux-next (20130128)
---
 drivers/input/keyboard/tegra-kbc.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 46e8ad2..016d931 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/input/tegra_kbc.h>
 #include <linux/clk/tegra.h>
+#include <linux/err.h>
 
 #define KBC_MAX_DEBOUNCE_CNT	0x3ffu
 
@@ -615,10 +616,10 @@ static int tegra_kbc_probe(struct platform_device *pdev)
 	spin_lock_init(&kbc->lock);
 	setup_timer(&kbc->timer, tegra_kbc_keypress_timer, (unsigned long)kbc);
 
-	kbc->mmio = devm_request_and_ioremap(&pdev->dev, res);
-	if (!kbc->mmio) {
+	kbc->mmio = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(kbc->mmio)) {
 		dev_err(&pdev->dev, "Cannot request memregion/iomap address\n");
-		return -EBUSY;
+		return PTR_ERR(kbc->mmio);
 	}
 
 	kbc->clk = devm_clk_get(&pdev->dev, NULL);
-- 
1.7.4.1

[PATCH 3/3] serial: tegra: Convert to devm_ioremap_resource()

[Sachin Kamat]

Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Laxman Dewangan <ldewangan@nvidia.com>
Cc: linux-serial@vger.kernel.org
---
Compile tested with linux-next (20130128).
---
 drivers/tty/serial/serial-tegra.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
index 4f5e629..80dfec1 100644
--- a/drivers/tty/serial/serial-tegra.c
+++ b/drivers/tty/serial/serial-tegra.c
@@ -26,6 +26,7 @@
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
+#include <linux/err.h>
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/module.h>
@@ -1302,10 +1303,10 @@ static int tegra_uart_probe(struct platform_device *pdev)
 	}
 
 	u->mapbase = resource->start;
-	u->membase = devm_request_and_ioremap(&pdev->dev, resource);
-	if (!u->membase) {
+	u->membase = devm_ioremap_resource(&pdev->dev, resource);
+	if (IS_ERR(u->membase)) {
 		dev_err(&pdev->dev, "memregion/iomap address req failed\n");
-		return -EADDRNOTAVAIL;
+		return PTR_ERR(u->membase);
 	}
 
 	tup->uart_clk = devm_clk_get(&pdev->dev, NULL);
-- 
1.7.4.1

Re: [PATCH 3/3] serial: tegra: Convert to devm_ioremap_resource()

[Stephen Warren]

On 01/31/2013 03:25 AM, Sachin Kamat wrote:
> Use the newly introduced devm_ioremap_resource() instead of
> devm_request_and_ioremap() which provides more consistent error handling.

Presumably though that function isn't yet available in the tree that
this new serial driver was merged through is it?

Re: [PATCH 3/3] serial: tegra: Convert to devm_ioremap_resource()

[Sachin Kamat]

On 31 January 2013 22:30, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 01/31/2013 03:25 AM, Sachin Kamat wrote:
>> Use the newly introduced devm_ioremap_resource() instead of
>> devm_request_and_ioremap() which provides more consistent error handling.
>
> Presumably though that function isn't yet available in the tree that
> this new serial driver was merged through is it?

The entire series is merged in Greg's driver-core tree [1] and I
presume all other associated patches would also be picked up by him.
Isn't it Greg?

[1] git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git

-- 
With warm regards,
Sachin

Re: [PATCH 3/3] serial: tegra: Convert to devm_ioremap_resource()

[Stephen Warren]

On 01/31/2013 09:20 PM, Sachin Kamat wrote:
> On 31 January 2013 22:30, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> On 01/31/2013 03:25 AM, Sachin Kamat wrote:
>>> Use the newly introduced devm_ioremap_resource() instead of
>>> devm_request_and_ioremap() which provides more consistent error handling.
>>
>> Presumably though that function isn't yet available in the tree that
>> this new serial driver was merged through is it?
> 
> The entire series is merged in Greg's driver-core tree [1] and I
> presume all other associated patches would also be picked up by him.
> Isn't it Greg?
> 
> [1] git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git

The Tegra serial driver went through Greg's TTY tree. I assume that goes
direct to Linus not through driver-core.git first.

https://git.kernel.org/?p=linux/kernel/git/gregkh/tty.git;a=shortlog;h=refs/heads/tty-next

Re: [PATCH 3/3] serial: tegra: Convert to devm_ioremap_resource()

[Sachin Kamat]

On 1 February 2013 09:54, Stephen Warren <swarren@wwwdotorg.org> wrote:
>>
>> The entire series is merged in Greg's driver-core tree [1] and I
>> presume all other associated patches would also be picked up by him.
>> Isn't it Greg?
>>
>> [1] git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
>
> The Tegra serial driver went through Greg's TTY tree. I assume that goes
> direct to Linus not through driver-core.git first.

Right. But AFAIK for this specific change he has carried the patches
in the device-core tree irrespective of the subsystem.


-- 
With warm regards,
Sachin

Re: [PATCH 3/3] serial: tegra: Convert to devm_ioremap_resource()

[Stephen Warren]

On 02/01/2013 02:49 AM, Sachin Kamat wrote:
> On 1 February 2013 09:54, Stephen Warren <swarren@wwwdotorg.org> wrote:
>>>
>>> The entire series is merged in Greg's driver-core tree [1] and I
>>> presume all other associated patches would also be picked up by him.
>>> Isn't it Greg?
>>>
>>> [1] git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
>>
>> The Tegra serial driver went through Greg's TTY tree. I assume that goes
>> direct to Linus not through driver-core.git first.
> 
> Right. But AFAIK for this specific change he has carried the patches
> in the device-core tree irrespective of the subsystem.

Yes, but the Tegra serial driver is new for 3.9, and hence does not yet
exist in driver-core.git.

Re: [PATCH 3/3] serial: tegra: Convert to devm_ioremap_resource()

[gregkh]

On Sat, Feb 02, 2013 at 10:22:16AM +0530, Sachin Kamat wrote:
> 
> 
> On Friday, 1 February 2013, Stephen Warren <swarren@wwwdotorg.org> wrote:
> > On 02/01/2013 02:49 AM, Sachin Kamat wrote:
> >> On 1 February 2013 09:54, Stephen Warren <swarren@wwwdotorg.org> wrote:
> >>>>
> >>>> The entire series is merged in Greg's driver-core tree [1] and I
> >>>> presume all other associated patches would also be picked up by him.
> >>>> Isn't it Greg?
> >>>>
> >>>> [1] git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
> >>>
> >>> The Tegra serial driver went through Greg's TTY tree. I assume that goes
> >>> direct to Linus not through driver-core.git first.
> >>
> >> Right. But AFAIK for this specific change he has carried the patches
> >> in the device-core tree irrespective of the subsystem.
> >
> > Yes, but the Tegra serial driver is new for 3.9, and hence does not yet
> > exist in driver-core.git.
> >
> 
> Oh ok. Then probably we can have this patch only after 3.9-rc1 is out.

Yes, Stephen can take this patch now.

Re: [PATCH 3/3] serial: tegra: Convert to devm_ioremap_resource()

[Stephen Warren]

On 03/15/2013 10:38 AM, gregkh@linuxfoundation.org wrote:
> On Sat, Feb 02, 2013 at 10:22:16AM +0530, Sachin Kamat wrote:
>>
>>
>> On Friday, 1 February 2013, Stephen Warren <swarren@wwwdotorg.org> wrote:
>>> On 02/01/2013 02:49 AM, Sachin Kamat wrote:
>>>> On 1 February 2013 09:54, Stephen Warren <swarren@wwwdotorg.org> wrote:
>>>>>>
>>>>>> The entire series is merged in Greg's driver-core tree [1] and I
>>>>>> presume all other associated patches would also be picked up by him.
>>>>>> Isn't it Greg?
>>>>>>
>>>>>> [1] git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
>>>>>
>>>>> The Tegra serial driver went through Greg's TTY tree. I assume that goes
>>>>> direct to Linus not through driver-core.git first.
>>>>
>>>> Right. But AFAIK for this specific change he has carried the patches
>>>> in the device-core tree irrespective of the subsystem.
>>>
>>> Yes, but the Tegra serial driver is new for 3.9, and hence does not yet
>>> exist in driver-core.git.
>>>
>>
>> Oh ok. Then probably we can have this patch only after 3.9-rc1 is out.
> 
> Yes, Stephen can take this patch now.

There's no need for me to take the patch I think; now that 3.9-rc1 is
out, the serial and driver core trees all have whatever dependencies
this series needed, so any patches can go through their usual trees, I
think... (Sorry, the context of this discussion was little while ago).

Re: [PATCH 3/3] serial: tegra: Convert to devm_ioremap_resource()

[gregkh]

On Fri, Mar 15, 2013 at 11:14:01AM -0600, Stephen Warren wrote:
> On 03/15/2013 10:38 AM, gregkh@linuxfoundation.org wrote:
> > On Sat, Feb 02, 2013 at 10:22:16AM +0530, Sachin Kamat wrote:
> >>
> >>
> >> On Friday, 1 February 2013, Stephen Warren <swarren@wwwdotorg.org> wrote:
> >>> On 02/01/2013 02:49 AM, Sachin Kamat wrote:
> >>>> On 1 February 2013 09:54, Stephen Warren <swarren@wwwdotorg.org> wrote:
> >>>>>>
> >>>>>> The entire series is merged in Greg's driver-core tree [1] and I
> >>>>>> presume all other associated patches would also be picked up by him.
> >>>>>> Isn't it Greg?
> >>>>>>
> >>>>>> [1] git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
> >>>>>
> >>>>> The Tegra serial driver went through Greg's TTY tree. I assume that goes
> >>>>> direct to Linus not through driver-core.git first.
> >>>>
> >>>> Right. But AFAIK for this specific change he has carried the patches
> >>>> in the device-core tree irrespective of the subsystem.
> >>>
> >>> Yes, but the Tegra serial driver is new for 3.9, and hence does not yet
> >>> exist in driver-core.git.
> >>>
> >>
> >> Oh ok. Then probably we can have this patch only after 3.9-rc1 is out.
> > 
> > Yes, Stephen can take this patch now.
> 
> There's no need for me to take the patch I think; now that 3.9-rc1 is
> out, the serial and driver core trees all have whatever dependencies
> this series needed, so any patches can go through their usual trees, I
> think... (Sorry, the context of this discussion was little while ago).

Ok, can someone please resend the serial patch then?  I dropped it.

thanks,

greg k-h

Re: [PATCH 3/3] serial: tegra: Convert to devm_ioremap_resource()

[Sachin Kamat]

>> There's no need for me to take the patch I think; now that 3.9-rc1 is
>> out, the serial and driver core trees all have whatever dependencies
>> this series needed, so any patches can go through their usual trees, I
>> think... (Sorry, the context of this discussion was little while ago).
>
> Ok, can someone please resend the serial patch then?  I dropped it.
>

You already applied the resent version of this patch.
Thanks Greg :)


-- 
With warm regards,
Sachin

Re: [PATCH 1/3] video: exynos_mipi_dsi: Convert to devm_ioremap_resource()

[Thierry Reding]

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

On Thu, Jan 31, 2013 at 03:55:37PM +0530, Sachin Kamat wrote:
> Use the newly introduced devm_ioremap_resource() instead of
> devm_request_and_ioremap() which provides more consistent error handling.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Donghwa Lee <dh09.lee@samsung.com>
> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> Cc: linux-fbdev@vger.kernel.org
> ---
>  drivers/video/exynos/exynos_mipi_dsi.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)

All of these can drop the additional error message because equivalent
error message are output by devm_ioremap_resource() itself.

Thierry

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

Re: [PATCH 1/3] video: exynos_mipi_dsi: Convert to devm_ioremap_resource()

[Sachin Kamat]

On 31 January 2013 16:12, Thierry Reding
<thierry.reding@avionic-design.de> wrote:
> On Thu, Jan 31, 2013 at 03:55:37PM +0530, Sachin Kamat wrote:
>> Use the newly introduced devm_ioremap_resource() instead of
>> devm_request_and_ioremap() which provides more consistent error handling.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> Cc: Donghwa Lee <dh09.lee@samsung.com>
>> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
>> Cc: linux-fbdev@vger.kernel.org
>> ---
>>  drivers/video/exynos/exynos_mipi_dsi.c |    7 ++++---
>>  1 files changed, 4 insertions(+), 3 deletions(-)
>
> All of these can drop the additional error message because equivalent
> error message are output by devm_ioremap_resource() itself.

Ah right.. I will remove them and re-send the patches.

-- 
With warm regards,
Sachin