Skip to content

Commit d4218e2

Browse files
committed
Merge branch 'pci/controller/iproc'
- Use of_property_read_bool() instead of low-level accessors for boolean properties (Rob Herring) * pci/controller/iproc: PCI: iproc: Use of_property_read_bool() for boolean properties
2 parents 59a2b16 + 8f1c517 commit d4218e2

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/pci/controller/pcie-iproc-msi.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node)
525525
if (!of_device_is_compatible(node, "brcm,iproc-msi"))
526526
return -ENODEV;
527527

528-
if (!of_find_property(node, "msi-controller", NULL))
528+
if (!of_property_read_bool(node, "msi-controller"))
529529
return -ENODEV;
530530

531531
if (pcie->msi)
@@ -585,8 +585,7 @@ int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node)
585585
return -EINVAL;
586586
}
587587

588-
if (of_find_property(node, "brcm,pcie-msi-inten", NULL))
589-
msi->has_inten_reg = true;
588+
msi->has_inten_reg = of_property_read_bool(node, "brcm,pcie-msi-inten");
590589

591590
msi->nr_msi_vecs = msi->nr_irqs * EQ_LEN;
592591
msi->bitmap = devm_bitmap_zalloc(pcie->dev, msi->nr_msi_vecs,

0 commit comments

Comments
 (0)