diff options
-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 9088c93895fd..01c835a466bc 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) | |||
4797 | cy_writel(addr + initctl, readl(addr + initctl) & ~0x20000000); | 4797 | cy_writel(addr + initctl, readl(addr + initctl) & ~0x20000000); |
4798 | } | 4798 | } |
4799 | 4799 | ||
4800 | static int __devinit cy_init_Ze(unsigned long cy_pci_phys0, | 4800 | static int __devinit cy_init_Ze(struct RUNTIME_9060 __iomem *cy_pci_addr0, |
4801 | unsigned long cy_pci_phys2, | ||
4802 | struct RUNTIME_9060 __iomem *cy_pci_addr0, | ||
4803 | int cy_pci_irq, struct pci_dev *pdev) | 4801 | int cy_pci_irq, struct pci_dev *pdev) |
4804 | { | 4802 | { |
4805 | void __iomem *cy_pci_addr2; | 4803 | void __iomem *cy_pci_addr2; |
@@ -4869,7 +4867,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
4869 | { | 4867 | { |
4870 | unsigned char cyy_rev_id; | 4868 | unsigned char cyy_rev_id; |
4871 | int cy_pci_irq; | 4869 | int cy_pci_irq; |
4872 | __u32 cy_pci_phys0, cy_pci_phys2, mailbox; | 4870 | __u32 mailbox; |
4873 | void __iomem *cy_pci_addr0, *cy_pci_addr2; | 4871 | void __iomem *cy_pci_addr0, *cy_pci_addr2; |
4874 | unsigned int device_id; | 4872 | unsigned int device_id; |
4875 | unsigned short j, cy_pci_nchan, plx_ver; | 4873 | unsigned short j, cy_pci_nchan, plx_ver; |
@@ -4883,8 +4881,6 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
4883 | 4881 | ||
4884 | /* read PCI configuration area */ | 4882 | /* read PCI configuration area */ |
4885 | cy_pci_irq = pdev->irq; | 4883 | cy_pci_irq = pdev->irq; |
4886 | cy_pci_phys0 = pci_resource_start(pdev, 0); | ||
4887 | cy_pci_phys2 = pci_resource_start(pdev, 2); | ||
4888 | pci_read_config_byte(pdev, PCI_REVISION_ID, &cyy_rev_id); | 4884 | pci_read_config_byte(pdev, PCI_REVISION_ID, &cyy_rev_id); |
4889 | 4885 | ||
4890 | device_id = pdev->device & ~PCI_DEVICE_ID_MASK; | 4886 | device_id = pdev->device & ~PCI_DEVICE_ID_MASK; |
@@ -5038,8 +5034,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, | |||
5038 | } | 5034 | } |
5039 | 5035 | ||
5040 | if (mailbox == ZE_V1) { | 5036 | if (mailbox == ZE_V1) { |
5041 | retval = cy_init_Ze(cy_pci_phys0, cy_pci_phys2, | 5037 | retval = cy_init_Ze(cy_pci_addr0, cy_pci_irq, pdev); |
5042 | cy_pci_addr0, cy_pci_irq, pdev); | ||
5043 | return retval; | 5038 | return retval; |
5044 | } else { | 5039 | } else { |
5045 | cy_pci_addr2 = pci_iomap(pdev, 2, CyPCI_Zwin); | 5040 | cy_pci_addr2 = pci_iomap(pdev, 2, CyPCI_Zwin); |