diff options
author | Saurabh Sengar <saurabh.truth@gmail.com> | 2015-11-17 23:10:12 -0500 |
---|---|---|
committer | Peter Chen <peter.chen@freescale.com> | 2015-12-24 01:15:27 -0500 |
commit | 4b19b78aa6f1f57a997d93fa05df6724792a85ba (patch) | |
tree | 4659c598e7cbb80d4f5d399305ed5ee7853656cc /drivers/usb/chipidea | |
parent | b09b5224fe86b3c9adef1bd9f0bd81800e8ff0b3 (diff) |
usb: chipidea: removing of_find_property
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>
Diffstat (limited to 'drivers/usb/chipidea')
-rw-r--r-- | drivers/usb/chipidea/core.c | 57 |
1 files changed, 22 insertions, 35 deletions
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 3a237d03260c..7404064b9bbc 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c | |||
@@ -686,52 +686,39 @@ static int ci_get_platdata(struct device *dev, | |||
686 | if (usb_get_maximum_speed(dev) == USB_SPEED_FULL) | 686 | if (usb_get_maximum_speed(dev) == USB_SPEED_FULL) |
687 | platdata->flags |= CI_HDRC_FORCE_FULLSPEED; | 687 | platdata->flags |= CI_HDRC_FORCE_FULLSPEED; |
688 | 688 | ||
689 | if (of_find_property(dev->of_node, "phy-clkgate-delay-us", NULL)) | 689 | of_property_read_u32(dev->of_node, "phy-clkgate-delay-us", |
690 | of_property_read_u32(dev->of_node, "phy-clkgate-delay-us", | ||
691 | &platdata->phy_clkgate_delay_us); | 690 | &platdata->phy_clkgate_delay_us); |
692 | 691 | ||
693 | platdata->itc_setting = 1; | 692 | platdata->itc_setting = 1; |
694 | if (of_find_property(dev->of_node, "itc-setting", NULL)) { | ||
695 | ret = of_property_read_u32(dev->of_node, "itc-setting", | ||
696 | &platdata->itc_setting); | ||
697 | if (ret) { | ||
698 | dev_err(dev, | ||
699 | "failed to get itc-setting\n"); | ||
700 | return ret; | ||
701 | } | ||
702 | } | ||
703 | 693 | ||
704 | if (of_find_property(dev->of_node, "ahb-burst-config", NULL)) { | 694 | of_property_read_u32(dev->of_node, "itc-setting", |
705 | ret = of_property_read_u32(dev->of_node, "ahb-burst-config", | 695 | &platdata->itc_setting); |
706 | &platdata->ahb_burst_config); | 696 | |
707 | if (ret) { | 697 | ret = of_property_read_u32(dev->of_node, "ahb-burst-config", |
708 | dev_err(dev, | 698 | &platdata->ahb_burst_config); |
709 | "failed to get ahb-burst-config\n"); | 699 | if (!ret) { |
710 | return ret; | ||
711 | } | ||
712 | platdata->flags |= CI_HDRC_OVERRIDE_AHB_BURST; | 700 | platdata->flags |= CI_HDRC_OVERRIDE_AHB_BURST; |
701 | } else if (ret != -EINVAL) { | ||
702 | dev_err(dev, "failed to get ahb-burst-config\n"); | ||
703 | return ret; | ||
713 | } | 704 | } |
714 | 705 | ||
715 | if (of_find_property(dev->of_node, "tx-burst-size-dword", NULL)) { | 706 | ret = of_property_read_u32(dev->of_node, "tx-burst-size-dword", |
716 | ret = of_property_read_u32(dev->of_node, "tx-burst-size-dword", | 707 | &platdata->tx_burst_size); |
717 | &platdata->tx_burst_size); | 708 | if (!ret) { |
718 | if (ret) { | ||
719 | dev_err(dev, | ||
720 | "failed to get tx-burst-size-dword\n"); | ||
721 | return ret; | ||
722 | } | ||
723 | platdata->flags |= CI_HDRC_OVERRIDE_TX_BURST; | 709 | platdata->flags |= CI_HDRC_OVERRIDE_TX_BURST; |
710 | } else if (ret != -EINVAL) { | ||
711 | dev_err(dev, "failed to get tx-burst-size-dword\n"); | ||
712 | return ret; | ||
724 | } | 713 | } |
725 | 714 | ||
726 | if (of_find_property(dev->of_node, "rx-burst-size-dword", NULL)) { | 715 | ret = of_property_read_u32(dev->of_node, "rx-burst-size-dword", |
727 | ret = of_property_read_u32(dev->of_node, "rx-burst-size-dword", | 716 | &platdata->rx_burst_size); |
728 | &platdata->rx_burst_size); | 717 | if (!ret) { |
729 | if (ret) { | ||
730 | dev_err(dev, | ||
731 | "failed to get rx-burst-size-dword\n"); | ||
732 | return ret; | ||
733 | } | ||
734 | platdata->flags |= CI_HDRC_OVERRIDE_RX_BURST; | 718 | platdata->flags |= CI_HDRC_OVERRIDE_RX_BURST; |
719 | } else if (ret != -EINVAL) { | ||
720 | dev_err(dev, "failed to get rx-burst-size-dword\n"); | ||
721 | return ret; | ||
735 | } | 722 | } |
736 | 723 | ||
737 | ext_id = ERR_PTR(-ENODEV); | 724 | ext_id = ERR_PTR(-ENODEV); |