drivers/nfc/nfcwilink.c: use devm_kzalloc
devm_kzalloc allocates memory that is released when a driver detaches. This patch uses devm_kzalloc 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> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
e93d083f42
Коммит
29b7d9ad91
|
@ -526,7 +526,7 @@ static int nfcwilink_probe(struct platform_device *pdev)
|
|||
|
||||
nfc_dev_dbg(&pdev->dev, "probe entry");
|
||||
|
||||
drv = kzalloc(sizeof(struct nfcwilink), GFP_KERNEL);
|
||||
drv = devm_kzalloc(&pdev->dev, sizeof(struct nfcwilink), GFP_KERNEL);
|
||||
if (!drv) {
|
||||
rc = -ENOMEM;
|
||||
goto exit;
|
||||
|
@ -547,7 +547,7 @@ static int nfcwilink_probe(struct platform_device *pdev)
|
|||
if (!drv->ndev) {
|
||||
nfc_dev_err(&pdev->dev, "nci_allocate_device failed");
|
||||
rc = -ENOMEM;
|
||||
goto free_exit;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
nci_set_parent_dev(drv->ndev, &pdev->dev);
|
||||
|
@ -566,9 +566,6 @@ static int nfcwilink_probe(struct platform_device *pdev)
|
|||
free_dev_exit:
|
||||
nci_free_device(drv->ndev);
|
||||
|
||||
free_exit:
|
||||
kfree(drv);
|
||||
|
||||
exit:
|
||||
return rc;
|
||||
}
|
||||
|
@ -588,8 +585,6 @@ static int nfcwilink_remove(struct platform_device *pdev)
|
|||
nci_unregister_device(ndev);
|
||||
nci_free_device(ndev);
|
||||
|
||||
kfree(drv);
|
||||
|
||||
dev_set_drvdata(&pdev->dev, NULL);
|
||||
|
||||
return 0;
|
||||
|
|
Загрузка…
Ссылка в новой задаче