]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
usb: chipidea: removing of_find_property
authorSaurabh Sengar <saurabh.truth@gmail.com>
Wed, 18 Nov 2015 04:10:12 +0000 (09:40 +0530)
committerPeter Chen <peter.chen@freescale.com>
Thu, 24 Dec 2015 06:15:27 +0000 (14:15 +0800)
call to of_find_property() before of_property_read_u32() is unnecessary.
of_property_read_u32() anyway calls to of_find_property() only.

Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
drivers/usb/chipidea/core.c

index 3a237d03260c47198d4ce16c13d52f06b320b040..7404064b9bbcb26016eacf33fdfbb1e6626ba09b 100644 (file)
@@ -686,52 +686,39 @@ static int ci_get_platdata(struct device *dev,
        if (usb_get_maximum_speed(dev) == USB_SPEED_FULL)
                platdata->flags |= CI_HDRC_FORCE_FULLSPEED;
 
-       if (of_find_property(dev->of_node, "phy-clkgate-delay-us", NULL))
-               of_property_read_u32(dev->of_node, "phy-clkgate-delay-us",
+       of_property_read_u32(dev->of_node, "phy-clkgate-delay-us",
                                     &platdata->phy_clkgate_delay_us);
 
        platdata->itc_setting = 1;
-       if (of_find_property(dev->of_node, "itc-setting", NULL)) {
-               ret = of_property_read_u32(dev->of_node, "itc-setting",
-                       &platdata->itc_setting);
-               if (ret) {
-                       dev_err(dev,
-                               "failed to get itc-setting\n");
-                       return ret;
-               }
-       }
 
-       if (of_find_property(dev->of_node, "ahb-burst-config", NULL)) {
-               ret = of_property_read_u32(dev->of_node, "ahb-burst-config",
-                       &platdata->ahb_burst_config);
-               if (ret) {
-                       dev_err(dev,
-                               "failed to get ahb-burst-config\n");
-                       return ret;
-               }
+       of_property_read_u32(dev->of_node, "itc-setting",
+                                       &platdata->itc_setting);
+
+       ret = of_property_read_u32(dev->of_node, "ahb-burst-config",
+                               &platdata->ahb_burst_config);
+       if (!ret) {
                platdata->flags |= CI_HDRC_OVERRIDE_AHB_BURST;
+       } else if (ret != -EINVAL) {
+               dev_err(dev, "failed to get ahb-burst-config\n");
+               return ret;
        }
 
-       if (of_find_property(dev->of_node, "tx-burst-size-dword", NULL)) {
-               ret = of_property_read_u32(dev->of_node, "tx-burst-size-dword",
-                       &platdata->tx_burst_size);
-               if (ret) {
-                       dev_err(dev,
-                               "failed to get tx-burst-size-dword\n");
-                       return ret;
-               }
+       ret = of_property_read_u32(dev->of_node, "tx-burst-size-dword",
+                               &platdata->tx_burst_size);
+       if (!ret) {
                platdata->flags |= CI_HDRC_OVERRIDE_TX_BURST;
+       } else if (ret != -EINVAL) {
+               dev_err(dev, "failed to get tx-burst-size-dword\n");
+               return ret;
        }
 
-       if (of_find_property(dev->of_node, "rx-burst-size-dword", NULL)) {
-               ret = of_property_read_u32(dev->of_node, "rx-burst-size-dword",
-                       &platdata->rx_burst_size);
-               if (ret) {
-                       dev_err(dev,
-                               "failed to get rx-burst-size-dword\n");
-                       return ret;
-               }
+       ret = of_property_read_u32(dev->of_node, "rx-burst-size-dword",
+                               &platdata->rx_burst_size);
+       if (!ret) {
                platdata->flags |= CI_HDRC_OVERRIDE_RX_BURST;
+       } else if (ret != -EINVAL) {
+               dev_err(dev, "failed to get rx-burst-size-dword\n");
+               return ret;
        }
 
        ext_id = ERR_PTR(-ENODEV);