Skip to content

Commit ea59ad0

Browse files
Wolfram Sangalexandrebelloni
authored andcommitted
rtc: sh: use local variables in probe() for mapping IO
No need to store the resource for the registers in the per-device struct because we only need it during probe. Remove some unneeded unlikely() while here and correct the type of 'regsize'. Signed-off-by: Wolfram Sang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexandre Belloni <[email protected]>
1 parent 33df0a5 commit ea59ad0

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

drivers/rtc/rtc-sh.c

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@
8686

8787
struct sh_rtc {
8888
void __iomem *regbase;
89-
unsigned long regsize;
90-
struct resource *res;
9189
int alarm_irq;
9290
struct clk *clk;
9391
struct rtc_device *rtc_dev;
@@ -328,10 +326,11 @@ static const struct rtc_class_ops sh_rtc_ops = {
328326
static int __init sh_rtc_probe(struct platform_device *pdev)
329327
{
330328
struct sh_rtc *rtc;
331-
struct resource *res;
329+
struct resource *res, *req_res;
332330
char clk_name[14];
333331
int clk_id, ret;
334332
unsigned int tmp;
333+
resource_size_t regsize;
335334

336335
rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
337336
if (unlikely(!rtc))
@@ -353,20 +352,18 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
353352
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
354353
if (!res)
355354
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
356-
if (unlikely(res == NULL)) {
355+
if (!res) {
357356
dev_err(&pdev->dev, "No IO resource\n");
358357
return -ENOENT;
359358
}
360359

361-
rtc->regsize = resource_size(res);
362-
363-
rtc->res = devm_request_mem_region(&pdev->dev, res->start,
364-
rtc->regsize, pdev->name);
365-
if (unlikely(!rtc->res))
360+
regsize = resource_size(res);
361+
req_res = devm_request_mem_region(&pdev->dev, res->start, regsize, pdev->name);
362+
if (!req_res)
366363
return -EBUSY;
367364

368-
rtc->regbase = devm_ioremap(&pdev->dev, rtc->res->start, rtc->regsize);
369-
if (unlikely(!rtc->regbase))
365+
rtc->regbase = devm_ioremap(&pdev->dev, req_res->start, regsize);
366+
if (!rtc->regbase)
370367
return -EINVAL;
371368

372369
if (!pdev->dev.of_node) {

0 commit comments

Comments
 (0)