aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/ti/davinci_mdio.c21
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index 47571980f7ed..34e97eca561c 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -363,24 +363,9 @@ static int davinci_mdio_probe(struct platform_device *pdev)
363 spin_lock_init(&data->lock); 363 spin_lock_init(&data->lock);
364 364
365 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 365 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
366 if (!res) { 366 data->regs = devm_ioremap_resource(dev, res);
367 dev_err(dev, "could not find register map resource\n"); 367 if (IS_ERR(data->regs)) {
368 ret = -ENOENT; 368 ret = PTR_ERR(data->regs);
369 goto bail_out;
370 }
371
372 res = devm_request_mem_region(dev, res->start, resource_size(res),
373 dev_name(dev));
374 if (!res) {
375 dev_err(dev, "could not allocate register map resource\n");
376 ret = -ENXIO;
377 goto bail_out;
378 }
379
380 data->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
381 if (!data->regs) {
382 dev_err(dev, "could not map mdio registers\n");
383 ret = -ENOMEM;
384 goto bail_out; 369 goto bail_out;
385 } 370 }
386 371