projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[cascardo/linux.git]
/
arch
/
powerpc
/
platforms
/
powernv
/
pci.c
diff --git
a/arch/powerpc/platforms/powernv/pci.c
b/arch/powerpc/platforms/powernv/pci.c
index
a21d831
..
db7b802
100644
(file)
--- a/
arch/powerpc/platforms/powernv/pci.c
+++ b/
arch/powerpc/platforms/powernv/pci.c
@@
-186,7
+186,7
@@
int pnv_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
return -ENOSPC;
}
virq = irq_create_mapping(NULL, phb->msi_base + hwirq);
return -ENOSPC;
}
virq = irq_create_mapping(NULL, phb->msi_base + hwirq);
- if (
virq == NO_IRQ
) {
+ if (
!virq
) {
pr_warn("%s: Failed to map MSI to linux irq\n",
pci_name(pdev));
msi_bitmap_free_hwirqs(&phb->msi_bmp, hwirq, 1);
pr_warn("%s: Failed to map MSI to linux irq\n",
pci_name(pdev));
msi_bitmap_free_hwirqs(&phb->msi_bmp, hwirq, 1);
@@
-217,7
+217,7
@@
void pnv_teardown_msi_irqs(struct pci_dev *pdev)
return;
for_each_pci_msi_entry(entry, pdev) {
return;
for_each_pci_msi_entry(entry, pdev) {
- if (
entry->irq == NO_IRQ
)
+ if (
!entry->irq
)
continue;
hwirq = virq_to_hw(entry->irq);
irq_set_msi_desc(entry->irq, NULL);
continue;
hwirq = virq_to_hw(entry->irq);
irq_set_msi_desc(entry->irq, NULL);
@@
-309,8
+309,8
@@
static void pnv_pci_dump_p7ioc_diag_data(struct pci_controller *hose,
be64_to_cpu(data->dma1ErrorLog1));
for (i = 0; i < OPAL_P7IOC_NUM_PEST_REGS; i++) {
be64_to_cpu(data->dma1ErrorLog1));
for (i = 0; i < OPAL_P7IOC_NUM_PEST_REGS; i++) {
- if ((
data->pestA[i]
>> 63) == 0 &&
- (
data->pestB[i]
>> 63) == 0)
+ if ((
be64_to_cpu(data->pestA[i])
>> 63) == 0 &&
+ (
be64_to_cpu(data->pestB[i])
>> 63) == 0)
continue;
pr_info("PE[%3d] A/B: %016llx %016llx\n",
continue;
pr_info("PE[%3d] A/B: %016llx %016llx\n",