Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18e37f2a authored by Marc Zyngier's avatar Marc Zyngier Committed by Jeff Garzik
Browse files

[PATCH] netdrvr: Convert cassini to pci_iomap 



Folks,

This patch (against 2.6.17-rc1) converts the cassini driver to the
pci_iomap API that will do the right thing, so architectures like
PARISC can stop screaming about illegal usage of ioremap() on
non-cacheable regions.

Tested on 64bit PARISC kernel.

Signed-off-by: default avatarMarc Zyngier <maz@misterjones.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent d5498bef

drivers/net/cassini.c

+4 −5
Original line number Diff line number Diff line
@@ -4877,7 +4877,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev, 
				  const struct pci_device_id *ent)

{

	static int cas_version_printed = 0;

	unsigned long casreg_base, casreg_len;

	unsigned long casreg_len;

	struct net_device *dev;

	struct cas *cp;

	int i, err, pci_using_dac;
@@ -4972,7 +4972,6 @@ static int __devinit cas_init_one(struct pci_dev *pdev, 
		pci_using_dac = 0;

	}



	casreg_base = pci_resource_start(pdev, 0);

	casreg_len = pci_resource_len(pdev, 0);



	cp = netdev_priv(dev);
@@ -5024,7 +5023,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev, 
	cp->timer_ticks = 0;



	/* give us access to cassini registers */

	cp->regs = ioremap(casreg_base, casreg_len);

	cp->regs = pci_iomap(pdev, 0, casreg_len);

	if (cp->regs == 0UL) {

		printk(KERN_ERR PFX "Cannot map device registers, "

		       "aborting.\n");
@@ -5123,7 +5122,7 @@ err_out_iounmap: 
		cas_shutdown(cp);

	mutex_unlock(&cp->pm_mutex);



	iounmap(cp->regs);

	pci_iounmap(pdev, cp->regs);





err_out_free_res:
@@ -5171,7 +5170,7 @@ static void __devexit cas_remove_one(struct pci_dev *pdev) 
#endif

	pci_free_consistent(pdev, sizeof(struct cas_init_block),

			    cp->init_block, cp->block_dvma);

	iounmap(cp->regs);

	pci_iounmap(pdev, cp->regs);

	free_netdev(dev);

	pci_release_regions(pdev);

	pci_disable_device(pdev);