2008-10-21 09:18:23

by Hans J. Koch

[permalink] [raw]
Subject: Re: [PATCH] pci: use pci_ioremap_bar() in drivers/uio

Added Greg KH to CC since he handles the UIO patch queue. Also added
lkml since UIO patches are discussed there.

On Mon, Oct 20, 2008 at 09:54:44PM -0700, Arjan van de Ven wrote:
>
> >From 8d0e600e37f36d379b2f7652912f1b1090c9dfa3 Mon Sep 17 00:00:00 2001
> From: Arjan van de Ven <[email protected]>
> Date: Sun, 28 Sep 2008 16:20:35 -0700
> Subject: [PATCH] pci: use pci_ioremap_bar() in drivers/uio
>
> Use the newly introduced pci_ioremap_bar() function in drivers/uio.
> pci_ioremap_bar() just takes a pci device and a bar number, with the goal
> of making it really hard to get wrong, while also having a central place
> to stick sanity checks.
>
> CC: [email protected]
> Signed-off-by: Arjan van de Ven <[email protected]>

Signed-off-by: Hans J. Koch <[email protected]>

> ---
> drivers/uio/uio_cif.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c
> index 5737606..c60b8fc 100644
> --- a/drivers/uio/uio_cif.c
> +++ b/drivers/uio/uio_cif.c
> @@ -57,8 +57,7 @@ static int __devinit hilscher_pci_probe(struct pci_dev *dev,
> info->mem[0].addr = pci_resource_start(dev, 0);
> if (!info->mem[0].addr)
> goto out_release;
> - info->mem[0].internal_addr = ioremap(pci_resource_start(dev, 0),
> - pci_resource_len(dev, 0));
> + info->mem[0].internal_addr = pci_ioremap_bar(dev, 0);
> if (!info->mem[0].internal_addr)
> goto out_release;
>
> --
> 1.5.5.1
>
>
> --
> Arjan van de Ven Intel Open Source Technology Centre
> For development, discussion and tips for power savings,
> visit http://www.lesswatts.org


2008-10-27 19:53:28

by Greg KH

[permalink] [raw]
Subject: patch uio-use-pci_ioremap_bar-in-drivers-uio.patch added to gregkh-2.6 tree


This is a note to let you know that I've just added the patch titled

Subject: UIO: use pci_ioremap_bar() in drivers/uio

to my gregkh-2.6 tree. Its filename is

uio-use-pci_ioremap_bar-in-drivers-uio.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/


>From [email protected] Mon Oct 27 11:23:22 2008
From: Arjan van de Ven <[email protected]>
Date: Tue, 21 Oct 2008 11:17:51 +0200
Subject: UIO: use pci_ioremap_bar() in drivers/uio
To: Arjan van de Ven <[email protected]>
Cc: [email protected], [email protected], Greg KH <[email protected]>, LKML <[email protected]>
Message-ID: <20081021091750.GA2966@local>
Content-Disposition: inline

From: Arjan van de Ven <[email protected]>

Use the newly introduced pci_ioremap_bar() function in drivers/uio.
pci_ioremap_bar() just takes a pci device and a bar number, with the goal
of making it really hard to get wrong, while also having a central place
to stick sanity checks.

Signed-off-by: Arjan van de Ven <[email protected]>
Signed-off-by: Hans J. Koch <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

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

--- a/drivers/uio/uio_cif.c
+++ b/drivers/uio/uio_cif.c
@@ -57,8 +57,7 @@ static int __devinit hilscher_pci_probe(
info->mem[0].addr = pci_resource_start(dev, 0);
if (!info->mem[0].addr)
goto out_release;
- info->mem[0].internal_addr = ioremap(pci_resource_start(dev, 0),
- pci_resource_len(dev, 0));
+ info->mem[0].internal_addr = pci_ioremap_bar(dev, 0);
if (!info->mem[0].internal_addr)
goto out_release;



Patches currently in gregkh-2.6 which might be from [email protected] are

usb/usb-use-pci_ioremap_bar-in-drivers-usb.patch
driver-core/uio-use-pci_ioremap_bar-in-drivers-uio.patch