renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 06:34:11 +08:00
Code

staging: most: hdm-dim2: Switch to devm_ioremap_resource()

Browse Source 
Devm_ functions allocate memory that is released when a driver
detaches. Replace request_mem_region and ioremap with
devm_ioremap_resource and remove corresponding freeing functions
release_mem_region and iounmap from probe and remove functions of a
platform device.

Also, an unnecessary platform_set_drvdata() has been removed since the
driver core clears the driver data to NULL after device release or on
probe failure. There is no need to manually clear the device driver
data to NULL.

Lastly, unnecessary labels have been removed.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Amitoj Kaur Chawla 2016-02-18 20:11:50 +05:30 committed by Greg Kroah-Hartman
parent 8661fca6f6
commit bab469cdb6
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/staging/most/hdm-dim2/dim2_hdm.c
View File

@ -747,29 +747,14 @@ static int dim2_probe(struct platform_device *pdev)
test_dev = dev; test_dev = dev;
#else #else
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) { dev->io_base = devm_ioremap_resource(&pdev->dev, res);
pr_err("no memory region defined\n"); if (IS_ERR(dev->io_base))
ret = -ENOENT; return PTR_ERR(dev->io_base);
return ret;
}
if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
pr_err("failed to request mem region\n");
ret = -EBUSY;
return ret;
}
dev->io_base = ioremap(res->start, resource_size(res));
if (!dev->io_base) {
pr_err("failed to ioremap\n");
ret = -ENOMEM;
goto err_release_mem;
}
ret = platform_get_irq(pdev, 0); ret = platform_get_irq(pdev, 0);
if (ret < 0) { if (ret < 0) {
pr_err("failed to get irq\n"); pr_err("failed to get irq\n");
goto err_unmap_io; return -ENODEV;
} }
dev->irq_ahb0 = ret; dev->irq_ahb0 = ret;
@ -777,7 +762,7 @@ static int dim2_probe(struct platform_device *pdev)
if (ret) { if (ret) {
pr_err("failed to request IRQ: %d, err: %d\n", pr_err("failed to request IRQ: %d, err: %d\n",
dev->irq_ahb0, ret); dev->irq_ahb0, ret);
goto err_unmap_io; return ret;
} }
#endif #endif
init_waitqueue_head(&dev->netinfo_waitq); init_waitqueue_head(&dev->netinfo_waitq);
@ -858,10 +843,6 @@ err_stop_thread:
err_free_irq: err_free_irq:
#if !defined(ENABLE_HDM_TEST) #if !defined(ENABLE_HDM_TEST)
free_irq(dev->irq_ahb0, dev); free_irq(dev->irq_ahb0, dev);
err_unmap_io:
iounmap(dev->io_base);
err_release_mem:
release_mem_region(res->start, resource_size(res));
#endif #endif
return ret; return ret;
@ -876,7 +857,6 @@ err_release_mem:
static int dim2_remove(struct platform_device *pdev) static int dim2_remove(struct platform_device *pdev)
{ {
struct dim2_hdm *dev = platform_get_drvdata(pdev); struct dim2_hdm *dev = platform_get_drvdata(pdev);
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
struct dim2_platform_data *pdata = pdev->dev.platform_data; struct dim2_platform_data *pdata = pdev->dev.platform_data;
unsigned long flags; unsigned long flags;
@ -892,10 +872,7 @@ static int dim2_remove(struct platform_device *pdev)
kthread_stop(dev->netinfo_task); kthread_stop(dev->netinfo_task);
#if !defined(ENABLE_HDM_TEST) #if !defined(ENABLE_HDM_TEST)
free_irq(dev->irq_ahb0, dev); free_irq(dev->irq_ahb0, dev);
iounmap(dev->io_base);
release_mem_region(res->start, resource_size(res));
#endif #endif
platform_set_drvdata(pdev, NULL);
/* /*
* break link to local platform_device_id struct * break link to local platform_device_id struct