| pci_sabre.c (4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7) | pci_sabre.c (61c7a080a5a061c976988fd4b844dfb468dda255) |
|---|---|
| 1/* pci_sabre.c: Sabre specific PCI controller support. 2 * 3 * Copyright (C) 1997, 1998, 1999, 2007 David S. Miller (davem@davemloft.net) 4 * Copyright (C) 1998, 1999 Eddie C. Dost (ecd@skynet.be) 5 * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com) 6 */ 7 8#include <linux/kernel.h> --- 296 unchanged lines hidden (view full) --- 305 printk("(none)"); 306 printk("]\n"); 307 308 return IRQ_HANDLED; 309} 310 311static void sabre_register_error_handlers(struct pci_pbm_info *pbm) 312{ | 1/* pci_sabre.c: Sabre specific PCI controller support. 2 * 3 * Copyright (C) 1997, 1998, 1999, 2007 David S. Miller (davem@davemloft.net) 4 * Copyright (C) 1998, 1999 Eddie C. Dost (ecd@skynet.be) 5 * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com) 6 */ 7 8#include <linux/kernel.h> --- 296 unchanged lines hidden (view full) --- 305 printk("(none)"); 306 printk("]\n"); 307 308 return IRQ_HANDLED; 309} 310 311static void sabre_register_error_handlers(struct pci_pbm_info *pbm) 312{ |
| 313 struct device_node *dp = pbm->op->node; | 313 struct device_node *dp = pbm->op->dev.of_node; |
| 314 struct of_device *op; 315 unsigned long base = pbm->controller_regs; 316 u64 tmp; 317 int err; 318 319 if (pbm->chip_type == PBM_CHIP_TYPE_SABRE) 320 dp = dp->parent; 321 --- 129 unchanged lines hidden (view full) --- 451 pbm->pci_csr = pbm->controller_regs + SABRE_PCICTRL; 452 sabre_scan_bus(pbm, &op->dev); 453} 454 455static int __devinit sabre_probe(struct of_device *op, 456 const struct of_device_id *match) 457{ 458 const struct linux_prom64_registers *pr_regs; | 314 struct of_device *op; 315 unsigned long base = pbm->controller_regs; 316 u64 tmp; 317 int err; 318 319 if (pbm->chip_type == PBM_CHIP_TYPE_SABRE) 320 dp = dp->parent; 321 --- 129 unchanged lines hidden (view full) --- 451 pbm->pci_csr = pbm->controller_regs + SABRE_PCICTRL; 452 sabre_scan_bus(pbm, &op->dev); 453} 454 455static int __devinit sabre_probe(struct of_device *op, 456 const struct of_device_id *match) 457{ 458 const struct linux_prom64_registers *pr_regs; |
| 459 struct device_node *dp = op->node; | 459 struct device_node *dp = op->dev.of_node; |
| 460 struct pci_pbm_info *pbm; 461 u32 upa_portid, dma_mask; 462 struct iommu *iommu; 463 int tsbsize, err; 464 const u32 *vdma; 465 u64 clear_irq; 466 467 hummingbird_p = (match->data != NULL); --- 142 unchanged lines hidden --- | 460 struct pci_pbm_info *pbm; 461 u32 upa_portid, dma_mask; 462 struct iommu *iommu; 463 int tsbsize, err; 464 const u32 *vdma; 465 u64 clear_irq; 466 467 hummingbird_p = (match->data != NULL); --- 142 unchanged lines hidden --- |