diff options
author | Varka Bhadram <varkabhadram@gmail.com> | 2014-11-03 21:21:27 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 12:01:51 -0500 |
commit | e7020f193a3d135e5dda476452e3372e27cc1789 (patch) | |
tree | a2b784e22380068fe7db605588937161648312bf | |
parent | 3b59d31dd86b4839a62ac05de708cca3e20dfed4 (diff) |
host: xhci-plat: remove duplicate check on resource
Sanity check on resource happening with devm_ioremap_resource().
Signed-off-by: Varka Bhadram <varkab@cdac.in>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Felipe Balbi <balbi@ti.com>
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/host/xhci-plat.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 3d78b0cd674b..e68b4ec1757b 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c | |||
@@ -83,9 +83,6 @@ static int xhci_plat_probe(struct platform_device *pdev) | |||
83 | if (irq < 0) | 83 | if (irq < 0) |
84 | return -ENODEV; | 84 | return -ENODEV; |
85 | 85 | ||
86 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
87 | if (!res) | ||
88 | return -ENODEV; | ||
89 | 86 | ||
90 | if (of_device_is_compatible(pdev->dev.of_node, | 87 | if (of_device_is_compatible(pdev->dev.of_node, |
91 | "marvell,armada-375-xhci") || | 88 | "marvell,armada-375-xhci") || |
@@ -109,15 +106,16 @@ static int xhci_plat_probe(struct platform_device *pdev) | |||
109 | if (!hcd) | 106 | if (!hcd) |
110 | return -ENOMEM; | 107 | return -ENOMEM; |
111 | 108 | ||
112 | hcd->rsrc_start = res->start; | 109 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
113 | hcd->rsrc_len = resource_size(res); | ||
114 | |||
115 | hcd->regs = devm_ioremap_resource(&pdev->dev, res); | 110 | hcd->regs = devm_ioremap_resource(&pdev->dev, res); |
116 | if (IS_ERR(hcd->regs)) { | 111 | if (IS_ERR(hcd->regs)) { |
117 | ret = PTR_ERR(hcd->regs); | 112 | ret = PTR_ERR(hcd->regs); |
118 | goto put_hcd; | 113 | goto put_hcd; |
119 | } | 114 | } |
120 | 115 | ||
116 | hcd->rsrc_start = res->start; | ||
117 | hcd->rsrc_len = resource_size(res); | ||
118 | |||
121 | /* | 119 | /* |
122 | * Not all platforms have a clk so it is not an error if the | 120 | * Not all platforms have a clk so it is not an error if the |
123 | * clock does not exists. | 121 | * clock does not exists. |