Am Samstag 28 April 2007 00:50 schrieb Greg Kroah-Hartman:
> +static int __devinit hilscher_pci_probe(struct pci_dev *dev,
> + const struct pci_device_id *id)
> +{
> + struct uio_info *info;
> +
> + info = kzalloc(sizeof(struct uio_info), GFP_KERNEL);
> + if (!info)
> + return -ENOMEM;
> +
> + if (pci_enable_device(dev))
> + goto out_free;
> +
> + if (pci_request_regions(dev, "hilscher"))
> + goto out_disable;
> +
> + info->mem[0].addr = pci_resource_start(dev, 0);
> + if (!info->mem[0].addr)
> + goto out_release;
> + info->mem[0].internal_addr = ioremap_nocache(pci_resource_start(dev, 0),
> + pci_resource_len(dev, 0));
> + if (!info->mem[0].internal_addr)
> + goto out_release;
Alan Cox pointed out (offlist) that ioremap_nocache() is unneccessary here.
This patch replaces it with ioremap():
Thanks, Alan!
hjk
Index: linux-2.6.22-rc/drivers/uio/uio_cif.c
===================================================================
--- linux-2.6.22-rc.orig/drivers/uio/uio_cif.c 2007-04-29 21:34:45.000000000 +0200
+++ linux-2.6.22-rc/drivers/uio/uio_cif.c 2007-04-29 21:36:31.000000000 +0200
@@ -64,9 +64,8 @@
info->mem[0].addr = pci_resource_start(dev, 0);
if (!info->mem[0].addr)
goto out_release;
- info->mem[0].internal_addr = ioremap_nocache(
- pci_resource_start(dev, 0),
- pci_resource_len(dev, 0) );
+ info->mem[0].internal_addr = ioremap(pci_resource_start(dev, 0),
+ pci_resource_len(dev, 0) );
if (!info->mem[0].internal_addr)
goto out_release;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
