The patch titled
orinoco_pci: use pci_iomap() for resources
has been removed from the -mm tree. Its filename is
orinoco_pci-use-pci_iomap-for-resources.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Pavel Roskin <proski@xxxxxxx>
Signed-off-by: Pavel Roskin <proski@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/wireless/orinoco_pci.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff -puN drivers/net/wireless/orinoco_pci.c~orinoco_pci-use-pci_iomap-for-resources drivers/net/wireless/orinoco_pci.c
--- 25/drivers/net/wireless/orinoco_pci.c~orinoco_pci-use-pci_iomap-for-resources Fri Apr 7 15:37:42 2006
+++ 25-akpm/drivers/net/wireless/orinoco_pci.c Fri Apr 7 15:37:42 2006
@@ -170,9 +170,7 @@ static int orinoco_pci_init_one(struct p
const struct pci_device_id *ent)
{
int err = 0;
- unsigned long pci_iorange;
- u16 __iomem *pci_ioaddr = NULL;
- unsigned long pci_iolen;
+ void __iomem *pci_ioaddr = NULL;
struct orinoco_private *priv = NULL;
struct orinoco_pci_card *card;
struct net_device *dev = NULL;
@@ -190,10 +188,9 @@ static int orinoco_pci_init_one(struct p
}
/* Resource 0 is mapped to the hermes registers */
- pci_iorange = pci_resource_start(pdev, 0);
- pci_iolen = pci_resource_len(pdev, 0);
- pci_ioaddr = ioremap(pci_iorange, pci_iolen);
- if (!pci_iorange) {
+ pci_ioaddr = pci_iomap(pdev, 0, 0);
+ if (!pci_ioaddr) {
+ err = -EIO;
printk(KERN_ERR PFX "Cannot remap hardware registers\n");
goto fail_map;
}
@@ -208,8 +205,8 @@ static int orinoco_pci_init_one(struct p
priv = netdev_priv(dev);
card = priv->card;
card->pci_ioaddr = pci_ioaddr;
- dev->mem_start = pci_iorange;
- dev->mem_end = pci_iorange + pci_iolen - 1;
+ dev->mem_start = pci_resource_start(pdev, 0);
+ dev->mem_end = dev->mem_start + pci_resource_len(pdev, 0) - 1;
SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);
_
Patches currently in -mm which might be from proski@xxxxxxx are
origin.patch
git-wireless.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
