diff options
author | Jingoo Han <jg1.han@samsung.com> | 2014-04-03 17:49:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 19:21:18 -0400 |
commit | daaf90f0b014106e5672381c7b576a149b346dd9 (patch) | |
tree | 4ca2afc121075d3e0c37d402199e137d2f22476f | |
parent | 681acc9f53210f8a4c1b280b077f2cd73e63ac4c (diff) |
rtc: rtc-coh901331: use devm_ioremap_resource()
Use devm_ioremap_resource() in order to make the code simpler, and
remove redundant return value check of platform_get_resource() because
the value is checked by devm_ioremap_resource().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/rtc/rtc-coh901331.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c index 73f157519dff..869cae273799 100644 --- a/drivers/rtc/rtc-coh901331.c +++ b/drivers/rtc/rtc-coh901331.c | |||
@@ -43,8 +43,6 @@ | |||
43 | struct coh901331_port { | 43 | struct coh901331_port { |
44 | struct rtc_device *rtc; | 44 | struct rtc_device *rtc; |
45 | struct clk *clk; | 45 | struct clk *clk; |
46 | u32 phybase; | ||
47 | u32 physize; | ||
48 | void __iomem *virtbase; | 46 | void __iomem *virtbase; |
49 | int irq; | 47 | int irq; |
50 | #ifdef CONFIG_PM_SLEEP | 48 | #ifdef CONFIG_PM_SLEEP |
@@ -173,19 +171,9 @@ static int __init coh901331_probe(struct platform_device *pdev) | |||
173 | return -ENOMEM; | 171 | return -ENOMEM; |
174 | 172 | ||
175 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 173 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
176 | if (!res) | 174 | rtap->virtbase = devm_ioremap_resource(&pdev->dev, res); |
177 | return -ENOENT; | 175 | if (IS_ERR(rtap->virtbase)) |
178 | 176 | return PTR_ERR(rtap->virtbase); | |
179 | rtap->phybase = res->start; | ||
180 | rtap->physize = resource_size(res); | ||
181 | |||
182 | if (devm_request_mem_region(&pdev->dev, rtap->phybase, rtap->physize, | ||
183 | "rtc-coh901331") == NULL) | ||
184 | return -EBUSY; | ||
185 | |||
186 | rtap->virtbase = devm_ioremap(&pdev->dev, rtap->phybase, rtap->physize); | ||
187 | if (!rtap->virtbase) | ||
188 | return -ENOMEM; | ||
189 | 177 | ||
190 | rtap->irq = platform_get_irq(pdev, 0); | 178 | rtap->irq = platform_get_irq(pdev, 0); |
191 | if (devm_request_irq(&pdev->dev, rtap->irq, coh901331_interrupt, 0, | 179 | if (devm_request_irq(&pdev->dev, rtap->irq, coh901331_interrupt, 0, |