diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-12-10 10:11:00 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-10 10:11:00 +0100 |
| commit | 2040cf9f59037aa8aec749363e69ead165b67b43 (patch) | |
| tree | e9c15448e841cc493bc80b9f658d7955623e86dd /drivers/misc/atmel_tclib.c | |
| parent | f66c0447cca1281116224d474cdb37d6a18e4b5b (diff) | |
| parent | e42617b825f8073569da76dc4510bfa019b1c35a (diff) | |
Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/misc/atmel_tclib.c')
| -rw-r--r-- | drivers/misc/atmel_tclib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c index 08b5b639d77f6..7de7840f613c0 100644 --- a/drivers/misc/atmel_tclib.c +++ b/drivers/misc/atmel_tclib.c @@ -109,7 +109,6 @@ static int __init tc_probe(struct platform_device *pdev) struct atmel_tc *tc; struct clk *clk; int irq; - struct resource *r; unsigned int i; if (of_get_child_count(pdev->dev.of_node)) @@ -133,8 +132,7 @@ static int __init tc_probe(struct platform_device *pdev) if (IS_ERR(tc->slow_clk)) return PTR_ERR(tc->slow_clk); - r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - tc->regs = devm_ioremap_resource(&pdev->dev, r); + tc->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(tc->regs)) return PTR_ERR(tc->regs); |