ata: Use of_property_present() for testing DT property presence

It is preferred to use typed property access functions (i.e.
of_property_read_<type> functions) rather than low-level
of_get_property/of_find_property functions for reading properties. As
part of this, convert of_get_property/of_find_property calls to the
recently added of_property_present() helper when we just want to test
for presence of a property and nothing more.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

diff --git a/drivers/ata/ahci_mtk.c b/drivers/ata/ahci_mtk.c
index c056378e3e721ed4600cc6845afcfb1dea073edf..5714efe3f8e7df4defbb64c5ada1b8c6d35d06bf 100644 (file)
--- a/drivers/ata/ahci_mtk.c
+++ b/drivers/ata/ahci_mtk.c
@@ -106,7 +106,7 @@ static int mtk_ahci_parse_property(struct ahci_host_priv *hpriv,
        struct device_node *np = dev->of_node;
 
        /* enable SATA function if needed */
-       if (of_find_property(np, "mediatek,phy-mode", NULL)) {
+       if (of_property_present(np, "mediatek,phy-mode")) {
                plat->mode = syscon_regmap_lookup_by_phandle(
                                        np, "mediatek,phy-mode");
                if (IS_ERR(plat->mode)) {

diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
index b9e336bacf179bdabc905b920c9be3d1dfe8a550..f00da19670b04d77b7d40c6892f6b77e3a6b8fc5 100644 (file)
--- a/drivers/ata/libahci_platform.c
+++ b/drivers/ata/libahci_platform.c
@@ -363,7 +363,7 @@ static int ahci_platform_get_phy(struct ahci_host_priv *hpriv, u32 port,
        switch (rc) {
        case -ENOSYS:
                /* No PHY support. Check if PHY is required. */
-               if (of_find_property(node, "phys", NULL)) {
+               if (of_property_present(node, "phys")) {
                        dev_err(dev,
                                "couldn't get PHY in node %pOFn: ENOSYS\n",
                                node);

diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index 21d77633a98f3e7bf795c4c11ab3cdfcc091627c..3a30e6eff8a8898d069fab93a687cb5decb5b976 100644 (file)
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -810,7 +810,7 @@ static int sata_dwc_dma_get_channel(struct sata_dwc_device_port *hsdevp)
        struct device *dev = hsdev->dev;
 
 #ifdef CONFIG_SATA_DWC_OLD_DMA
-       if (!of_find_property(dev->of_node, "dmas", NULL))
+       if (!of_property_present(dev->of_node, "dmas"))
                return sata_dwc_dma_get_channel_old(hsdevp);
 #endif
 
@@ -1180,7 +1180,7 @@ static int sata_dwc_probe(struct platform_device *ofdev)
        }
 
 #ifdef CONFIG_SATA_DWC_OLD_DMA
-       if (!of_find_property(np, "dmas", NULL)) {
+       if (!of_property_present(np, "dmas")) {
                err = sata_dwc_dma_init_old(ofdev, hsdev);
                if (err)
                        return err;