Skip to content

Commit 09ef18b

Browse files
YueHaibingalexandrebelloni
YueHaibing
authored and
alexandrebelloni
committed
rtc: use devm_platform_ioremap_resource() to simplify code
Use devm_platform_ioremap_resource() to simplify the code a bit. This is detected by coccinelle. Signed-off-by: YueHaibing <yuehaibing@huawei.com> Link: https://lore.kernel.org/r/20191006102953.57536-2-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-3-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-4-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-5-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-6-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-7-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-8-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-9-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-10-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-11-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-12-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-13-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-14-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-15-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-16-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-17-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-18-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-19-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-20-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-21-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-22-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-23-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-24-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-25-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-26-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-27-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-28-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-29-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-30-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-31-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-32-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-33-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-34-yuehaibing@huawei.com Link: https://lore.kernel.org/r/20191006102953.57536-35-yuehaibing@huawei.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent 89576be commit 09ef18b

34 files changed

+34
-103
lines changed

‎drivers/rtc/rtc-asm9260.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ static int asm9260_rtc_probe(struct platform_device *pdev)
245245
{
246246
struct asm9260_rtc_priv *priv;
247247
struct device *dev = &pdev->dev;
248-
struct resource *res;
249248
int irq_alarm, ret;
250249
u32 ccr;
251250

@@ -260,8 +259,7 @@ static int asm9260_rtc_probe(struct platform_device *pdev)
260259
if (irq_alarm < 0)
261260
return irq_alarm;
262261

263-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
264-
priv->iobase = devm_ioremap_resource(dev, res);
262+
priv->iobase = devm_platform_ioremap_resource(pdev, 0);
265263
if (IS_ERR(priv->iobase))
266264
return PTR_ERR(priv->iobase);
267265

‎drivers/rtc/rtc-aspeed.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,12 @@ static const struct rtc_class_ops aspeed_rtc_ops = {
8585
static int aspeed_rtc_probe(struct platform_device *pdev)
8686
{
8787
struct aspeed_rtc *rtc;
88-
struct resource *res;
8988

9089
rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
9190
if (!rtc)
9291
return -ENOMEM;
9392

94-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
95-
rtc->base = devm_ioremap_resource(&pdev->dev, res);
93+
rtc->base = devm_platform_ioremap_resource(pdev, 0);
9694
if (IS_ERR(rtc->base))
9795
return PTR_ERR(rtc->base);
9896

‎drivers/rtc/rtc-at91sam9.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ static const struct rtc_class_ops at91_rtc_ops = {
334334
*/
335335
static int at91_rtc_probe(struct platform_device *pdev)
336336
{
337-
struct resource *r;
338337
struct sam9_rtc *rtc;
339338
int ret, irq;
340339
u32 mr;
@@ -358,8 +357,7 @@ static int at91_rtc_probe(struct platform_device *pdev)
358357

359358
platform_set_drvdata(pdev, rtc);
360359

361-
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
362-
rtc->rtt = devm_ioremap_resource(&pdev->dev, r);
360+
rtc->rtt = devm_platform_ioremap_resource(pdev, 0);
363361
if (IS_ERR(rtc->rtt))
364362
return PTR_ERR(rtc->rtt);
365363

‎drivers/rtc/rtc-brcmstb-waketimer.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ static int brcmstb_waketmr_probe(struct platform_device *pdev)
200200
{
201201
struct device *dev = &pdev->dev;
202202
struct brcmstb_waketmr *timer;
203-
struct resource *res;
204203
int ret;
205204

206205
timer = devm_kzalloc(dev, sizeof(*timer), GFP_KERNEL);
@@ -210,8 +209,7 @@ static int brcmstb_waketmr_probe(struct platform_device *pdev)
210209
platform_set_drvdata(pdev, timer);
211210
timer->dev = dev;
212211

213-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
214-
timer->base = devm_ioremap_resource(dev, res);
212+
timer->base = devm_platform_ioremap_resource(pdev, 0);
215213
if (IS_ERR(timer->base))
216214
return PTR_ERR(timer->base);
217215

‎drivers/rtc/rtc-cadence.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,16 +255,14 @@ static const struct rtc_class_ops cdns_rtc_ops = {
255255
static int cdns_rtc_probe(struct platform_device *pdev)
256256
{
257257
struct cdns_rtc *crtc;
258-
struct resource *res;
259258
int ret;
260259
unsigned long ref_clk_freq;
261260

262261
crtc = devm_kzalloc(&pdev->dev, sizeof(*crtc), GFP_KERNEL);
263262
if (!crtc)
264263
return -ENOMEM;
265264

266-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
267-
crtc->regs = devm_ioremap_resource(&pdev->dev, res);
265+
crtc->regs = devm_platform_ioremap_resource(pdev, 0);
268266
if (IS_ERR(crtc->regs))
269267
return PTR_ERR(crtc->regs);
270268

‎drivers/rtc/rtc-coh901331.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,13 @@ static int __init coh901331_probe(struct platform_device *pdev)
164164
{
165165
int ret;
166166
struct coh901331_port *rtap;
167-
struct resource *res;
168167

169168
rtap = devm_kzalloc(&pdev->dev,
170169
sizeof(struct coh901331_port), GFP_KERNEL);
171170
if (!rtap)
172171
return -ENOMEM;
173172

174-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
175-
rtap->virtbase = devm_ioremap_resource(&pdev->dev, res);
173+
rtap->virtbase = devm_platform_ioremap_resource(pdev, 0);
176174
if (IS_ERR(rtap->virtbase))
177175
return PTR_ERR(rtap->virtbase);
178176

‎drivers/rtc/rtc-davinci.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,6 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
469469
{
470470
struct device *dev = &pdev->dev;
471471
struct davinci_rtc *davinci_rtc;
472-
struct resource *res;
473472
int ret = 0;
474473

475474
davinci_rtc = devm_kzalloc(&pdev->dev, sizeof(struct davinci_rtc), GFP_KERNEL);
@@ -480,8 +479,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
480479
if (davinci_rtc->irq < 0)
481480
return davinci_rtc->irq;
482481

483-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
484-
davinci_rtc->base = devm_ioremap_resource(dev, res);
482+
davinci_rtc->base = devm_platform_ioremap_resource(pdev, 0);
485483
if (IS_ERR(davinci_rtc->base))
486484
return PTR_ERR(davinci_rtc->base);
487485

‎drivers/rtc/rtc-digicolor.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,16 +175,14 @@ static irqreturn_t dc_rtc_irq(int irq, void *dev_id)
175175

176176
static int __init dc_rtc_probe(struct platform_device *pdev)
177177
{
178-
struct resource *res;
179178
struct dc_rtc *rtc;
180179
int irq, ret;
181180

182181
rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
183182
if (!rtc)
184183
return -ENOMEM;
185184

186-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
187-
rtc->regs = devm_ioremap_resource(&pdev->dev, res);
185+
rtc->regs = devm_platform_ioremap_resource(pdev, 0);
188186
if (IS_ERR(rtc->regs))
189187
return PTR_ERR(rtc->regs);
190188

‎drivers/rtc/rtc-ds1216.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ static const struct rtc_class_ops ds1216_rtc_ops = {
137137

138138
static int __init ds1216_rtc_probe(struct platform_device *pdev)
139139
{
140-
struct resource *res;
141140
struct ds1216_priv *priv;
142141
u8 dummy[8];
143142

@@ -147,8 +146,7 @@ static int __init ds1216_rtc_probe(struct platform_device *pdev)
147146

148147
platform_set_drvdata(pdev, priv);
149148

150-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
151-
priv->ioaddr = devm_ioremap_resource(&pdev->dev, res);
149+
priv->ioaddr = devm_platform_ioremap_resource(pdev, 0);
152150
if (IS_ERR(priv->ioaddr))
153151
return PTR_ERR(priv->ioaddr);
154152

‎drivers/rtc/rtc-ds1286.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,15 +323,13 @@ static const struct rtc_class_ops ds1286_ops = {
323323
static int ds1286_probe(struct platform_device *pdev)
324324
{
325325
struct rtc_device *rtc;
326-
struct resource *res;
327326
struct ds1286_priv *priv;
328327

329328
priv = devm_kzalloc(&pdev->dev, sizeof(struct ds1286_priv), GFP_KERNEL);
330329
if (!priv)
331330
return -ENOMEM;
332331

333-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
334-
priv->rtcregs = devm_ioremap_resource(&pdev->dev, res);
332+
priv->rtcregs = devm_platform_ioremap_resource(pdev, 0);
335333
if (IS_ERR(priv->rtcregs))
336334
return PTR_ERR(priv->rtcregs);
337335

0 commit comments

Comments
 (0)