52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From 07c8b15688055d81ac8e1c8c964b9e4c302287f1 Mon Sep 17 00:00:00 2001
|
|
From: Stephen Boyd <sboyd@codeaurora.org>
|
|
Date: Mon, 22 Feb 2016 11:12:47 -0800
|
|
Subject: [PATCH] usb: dwc3: Remove impossible check for
|
|
of_clk_get_parent_count() < 0
|
|
|
|
The check for < 0 is impossible now that
|
|
of_clk_get_parent_count() returns an unsigned int. Simplify the
|
|
code and update the types.
|
|
|
|
Acked-by: Felipe Balbi <balbi@kernel.org>
|
|
Cc: <linux-usb@vger.kernel.org>
|
|
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
|
|
(cherry picked from commit 3d755dcc20dd452b52532eca17da40ebbd12aee9)
|
|
|
|
Change-Id: Iaa38e064d801fb36c855fea51c0443840368e0d3
|
|
Signed-off-by: Nitheesh Sekar <nsekar@codeaurora.org>
|
|
---
|
|
drivers/usb/dwc3/dwc3-of-simple.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c
|
|
index 9c9f741..9743353 100644
|
|
--- a/drivers/usb/dwc3/dwc3-of-simple.c
|
|
+++ b/drivers/usb/dwc3/dwc3-of-simple.c
|
|
@@ -42,6 +42,7 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)
|
|
struct device *dev = &pdev->dev;
|
|
struct device_node *np = dev->of_node;
|
|
|
|
+ unsigned int count;
|
|
int ret;
|
|
int i;
|
|
|
|
@@ -49,11 +50,11 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)
|
|
if (!simple)
|
|
return -ENOMEM;
|
|
|
|
- ret = of_clk_get_parent_count(np);
|
|
- if (ret < 0)
|
|
- return ret;
|
|
+ count = of_clk_get_parent_count(np);
|
|
+ if (!count)
|
|
+ return -ENOENT;
|
|
|
|
- simple->num_clocks = ret;
|
|
+ simple->num_clocks = count;
|
|
|
|
simple->clks = devm_kcalloc(dev, simple->num_clocks,
|
|
sizeof(struct clk *), GFP_KERNEL);
|
|
--
|
|
2.7.2
|
|
|