Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92c9f472 authored by Suniel Mahesh's avatar Suniel Mahesh Committed by Greg Kroah-Hartman
Browse files

staging: ccree: Replace kzalloc with devm_kzalloc 



It is recommended to use managed function devm_kzalloc, which
simplifies driver cleanup paths and driver code.
This patch does the following:
(a) replace kzalloc with devm_kzalloc.
(b) drop kfree(), because memory allocated with devm_kzalloc() is
automatically freed on driver detach, otherwise it leads to a double
free.
(c) remove unnecessary blank lines.

Signed-off-by: default avatarSuniel Mahesh <sunil.m@techveda.org>
[gby: rebase on top of latest coding style fixes changes]
Acked-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17d46dac

drivers/staging/ccree/ssi_driver.c

+4 −7
Original line number Diff line number Diff line
@@ -223,14 +223,15 @@ static int init_cc_resources(struct platform_device *plat_dev) 
	struct resource *req_mem_cc_regs = NULL;

	void __iomem *cc_base = NULL;

	bool irq_registered = false;

	struct ssi_drvdata *new_drvdata = kzalloc(sizeof(*new_drvdata),

						  GFP_KERNEL);

	struct ssi_drvdata *new_drvdata;

	struct device *dev = &plat_dev->dev;

	struct device_node *np = dev->of_node;

	u32 signature_val;

	int rc = 0;



	if (unlikely(!new_drvdata)) {

	new_drvdata = devm_kzalloc(&plat_dev->dev, sizeof(*new_drvdata),

				   GFP_KERNEL);

	if (!new_drvdata) {

		SSI_LOG_ERR("Failed to allocate drvdata");

		rc = -ENOMEM;

		goto init_cc_res_err;
@@ -435,10 +436,8 @@ static int init_cc_resources(struct platform_device *plat_dev) 
					   resource_size(new_drvdata->res_mem));

			new_drvdata->res_mem = NULL;

		}

		kfree(new_drvdata);

		dev_set_drvdata(&plat_dev->dev, NULL);

	}



	return rc;

}
@@ -479,8 +478,6 @@ static void cleanup_cc_resources(struct platform_device *plat_dev) 
		drvdata->cc_base = NULL;

		drvdata->res_mem = NULL;

	}



	kfree(drvdata);

	dev_set_drvdata(&plat_dev->dev, NULL);

}