OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/w1/masters/ds1wm.c: use devm_ functions 

The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses these functions for data that is allocated in
the probe function of a platform device and is only freed in the remove
function.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Julia Lawall 2012-12-07 00:15:23 +01:00 committed by Greg Kroah-Hartman
parent feee830394
commit eea2172e69
1 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/w1/masters/ds1wm.c
View File

@ -13,6 +13,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
@ -459,43 +460,34 @@ static int ds1wm_probe(struct platform_device *pdev)
if (!pdev) if (!pdev)
return -ENODEV; return -ENODEV;
ds1wm_data = kzalloc(sizeof(*ds1wm_data), GFP_KERNEL); ds1wm_data = devm_kzalloc(&pdev->dev, sizeof(*ds1wm_data), GFP_KERNEL);
if (!ds1wm_data) if (!ds1wm_data)
return -ENOMEM; return -ENOMEM;
platform_set_drvdata(pdev, ds1wm_data); platform_set_drvdata(pdev, ds1wm_data);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) { if (!res)
ret = -ENXIO; return -ENXIO;
goto err0; ds1wm_data->map = devm_ioremap(&pdev->dev, res->start,
} resource_size(res));
ds1wm_data->map = ioremap(res->start, resource_size(res)); if (!ds1wm_data->map)
if (!ds1wm_data->map) { return -ENOMEM;
ret = -ENOMEM;
goto err0;
}
/* calculate bus shift from mem resource */ /* calculate bus shift from mem resource */
ds1wm_data->bus_shift = resource_size(res) >> 3; ds1wm_data->bus_shift = resource_size(res) >> 3;
ds1wm_data->pdev = pdev; ds1wm_data->pdev = pdev;
ds1wm_data->cell = mfd_get_cell(pdev); ds1wm_data->cell = mfd_get_cell(pdev);
if (!ds1wm_data->cell) { if (!ds1wm_data->cell)
ret = -ENODEV; return -ENODEV;
goto err1;
}
plat = pdev->dev.platform_data; plat = pdev->dev.platform_data;
if (!plat) { if (!plat)
ret = -ENODEV; return -ENODEV;
goto err1;
}
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!res) { if (!res)
ret = -ENXIO; return -ENXIO;
goto err1;
}
ds1wm_data->irq = res->start; ds1wm_data->irq = res->start;
ds1wm_data->int_en_reg_none = (plat->active_high ? DS1WM_INTEN_IAS : 0); ds1wm_data->int_en_reg_none = (plat->active_high ? DS1WM_INTEN_IAS : 0);
ds1wm_data->reset_recover_delay = plat->reset_recover_delay; ds1wm_data->reset_recover_delay = plat->reset_recover_delay;
@ -505,10 +497,10 @@ static int ds1wm_probe(struct platform_device *pdev)
if (res->flags & IORESOURCE_IRQ_LOWEDGE) if (res->flags & IORESOURCE_IRQ_LOWEDGE)
irq_set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_FALLING); irq_set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_FALLING);
ret = request_irq(ds1wm_data->irq, ds1wm_isr, ret = devm_request_irq(&pdev->dev, ds1wm_data->irq, ds1wm_isr,
IRQF_DISABLED | IRQF_SHARED, "ds1wm", ds1wm_data); IRQF_DISABLED | IRQF_SHARED, "ds1wm", ds1wm_data);
if (ret) if (ret)
goto err1; return ret;
ds1wm_up(ds1wm_data); ds1wm_up(ds1wm_data);
@ -516,17 +508,12 @@ static int ds1wm_probe(struct platform_device *pdev)
ret = w1_add_master_device(&ds1wm_master); ret = w1_add_master_device(&ds1wm_master);
if (ret) if (ret)
goto err2; goto err;
return 0; return 0;
err2: err:
ds1wm_down(ds1wm_data); ds1wm_down(ds1wm_data);
free_irq(ds1wm_data->irq, ds1wm_data);
err1:
iounmap(ds1wm_data->map);
err0:
kfree(ds1wm_data);
return ret; return ret;
} }
@ -560,9 +547,6 @@ static int ds1wm_remove(struct platform_device *pdev)
w1_remove_master_device(&ds1wm_master); w1_remove_master_device(&ds1wm_master);
ds1wm_down(ds1wm_data); ds1wm_down(ds1wm_data);
free_irq(ds1wm_data->irq, ds1wm_data);
iounmap(ds1wm_data->map);
kfree(ds1wm_data);
return 0; return 0;
} }