diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2007-05-08 00:36:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:25 -0700 |
| commit | 6d8248e850309c0f05beb5bdbfc89b7901bf3d85 (patch) | |
| tree | 8a5d9c579832db4e4cfc7f70eb1796b3de402d9e /drivers/char | |
| parent | 3046d50ea58676759453faeefccf57fbc9b72a90 (diff) | |
| download | op-kernel-dev-6d8248e850309c0f05beb5bdbfc89b7901bf3d85.zip op-kernel-dev-6d8248e850309c0f05beb5bdbfc89b7901bf3d85.tar.gz | |
Char: cyclades, get rid of phys addresses
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/cyclades.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index 9088c93..01c835a 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c @@ -4797,9 +4797,7 @@ static void __devinit plx_init(void __iomem * addr, __u32 initctl) cy_writel(addr + initctl, readl(addr + initctl) & ~0x20000000); } -static int __devinit cy_init_Ze(unsigned long cy_pci_phys0, - unsigned long cy_pci_phys2, - struct RUNTIME_9060 __iomem *cy_pci_addr0, +static int __devinit cy_init_Ze(struct RUNTIME_9060 __iomem *cy_pci_addr0, int cy_pci_irq, struct pci_dev *pdev) { void __iomem *cy_pci_addr2; @@ -4869,7 +4867,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, { unsigned char cyy_rev_id; int cy_pci_irq; - __u32 cy_pci_phys0, cy_pci_phys2, mailbox; + __u32 mailbox; void __iomem *cy_pci_addr0, *cy_pci_addr2; unsigned int device_id; unsigned short j, cy_pci_nchan, plx_ver; @@ -4883,8 +4881,6 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, /* read PCI configuration area */ cy_pci_irq = pdev->irq; - cy_pci_phys0 = pci_resource_start(pdev, 0); - cy_pci_phys2 = pci_resource_start(pdev, 2); pci_read_config_byte(pdev, PCI_REVISION_ID, &cyy_rev_id); device_id = pdev->device & ~PCI_DEVICE_ID_MASK; @@ -5038,8 +5034,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, } if (mailbox == ZE_V1) { - retval = cy_init_Ze(cy_pci_phys0, cy_pci_phys2, - cy_pci_addr0, cy_pci_irq, pdev); + retval = cy_init_Ze(cy_pci_addr0, cy_pci_irq, pdev); return retval; } else { cy_pci_addr2 = pci_iomap(pdev, 2, CyPCI_Zwin); |
