@@ -364,7 +364,8 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
364364
365365 while (pci -> phb -> dma_window_size * children > 0x80000000ul )
366366 pci -> phb -> dma_window_size >>= 1 ;
367- DBG ("No ISA/IDE, window size is %x\n" , pci -> phb -> dma_window_size );
367+ DBG ("No ISA/IDE, window size is 0x%lx\n" ,
368+ pci -> phb -> dma_window_size );
368369 pci -> phb -> dma_window_base_cur = 0 ;
369370
370371 return ;
@@ -388,7 +389,7 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
388389 while (pci -> phb -> dma_window_size * children > 0x70000000ul )
389390 pci -> phb -> dma_window_size >>= 1 ;
390391
391- DBG ("ISA/IDE, window size is %x \n" , pci -> phb -> dma_window_size );
392+ DBG ("ISA/IDE, window size is 0x%lx \n" , pci -> phb -> dma_window_size );
392393
393394}
394395
@@ -442,7 +443,7 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev)
442443 struct device_node * dn , * mydn ;
443444 struct iommu_table * tbl ;
444445
445- DBG ("iommu_dev_setup_pSeries, dev %p (%s)\n" , dev , dev -> pretty_name );
446+ DBG ("iommu_dev_setup_pSeries, dev %p (%s)\n" , dev , pci_name ( dev ) );
446447
447448 mydn = dn = pci_device_to_OF_node (dev );
448449
@@ -469,7 +470,7 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev)
469470 if (dn && dn -> data ) {
470471 PCI_DN (mydn )-> iommu_table = PCI_DN (dn )-> iommu_table ;
471472 } else {
472- DBG ("iommu_dev_setup_pSeries, dev %p (%s) has no iommu table\n" , dev , dev -> pretty_name );
473+ DBG ("iommu_dev_setup_pSeries, dev %p (%s) has no iommu table\n" , dev , pci_name ( dev ) );
473474 }
474475}
475476
@@ -503,7 +504,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
503504 int * dma_window = NULL ;
504505 struct pci_dn * pci ;
505506
506- DBG ("iommu_dev_setup_pSeriesLP, dev %p (%s)\n" , dev , dev -> pretty_name );
507+ DBG ("iommu_dev_setup_pSeriesLP, dev %p (%s)\n" , dev , pci_name ( dev ) );
507508
508509 /* dev setup for LPAR is a little tricky, since the device tree might
509510 * contain the dma-window properties per-device and not neccesarily
0 commit comments