[PATCH] lpc_ich: use devres API to allocate private data

[PATCH] lpc_ich: use devres API to allocate private data

[Aaron Sierra]

Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
---
 drivers/mfd/lpc_ich.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index a0cfdf9..1264b68 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -878,7 +878,8 @@ static int lpc_ich_probe(struct pci_dev *dev,
 	int ret;
 	bool cell_added = false;
 
-	priv = kmalloc(GFP_KERNEL, sizeof(struct lpc_ich_priv));
+	priv = devm_kzalloc(&dev->dev,
+			    sizeof(struct lpc_ich_priv), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;
 
@@ -914,7 +915,6 @@ static int lpc_ich_probe(struct pci_dev *dev,
 		dev_warn(&dev->dev, "No MFD cells added\n");
 		lpc_ich_restore_config_space(dev);
 		pci_set_drvdata(dev, NULL);
-		kfree(priv);
 		return -ENODEV;
 	}
 
@@ -923,12 +923,9 @@ static int lpc_ich_probe(struct pci_dev *dev,
 
 static void lpc_ich_remove(struct pci_dev *dev)
 {
-	void *priv = pci_get_drvdata(dev);
-
 	mfd_remove_devices(&dev->dev);
 	lpc_ich_restore_config_space(dev);
 	pci_set_drvdata(dev, NULL);
-	kfree(priv);
 }
 
 static struct pci_driver lpc_ich_driver = {
-- 
1.7.9.5

Re: [PATCH] lpc_ich: use devres API to allocate private data

[Aaron Sierra]

----- Original Message -----
> From: "Aaron Sierra" <asierra@xes-inc.com>
> To: "Samuel Ortiz" <sameo@linux.intel.com>
> Cc: "LKML" <linux-kernel@vger.kernel.org>
> Sent: Thursday, February 14, 2013 11:35:04 AM
> Subject: [PATCH] lpc_ich: use devres API to allocate private data
>
> 
> Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
> ---

[trim]

> -	priv = kmalloc(GFP_KERNEL, sizeof(struct lpc_ich_priv));
> +	priv = devm_kzalloc(&dev->dev,
> +			    sizeof(struct lpc_ich_priv), GFP_KERNEL);

Samuel,
Perhaps this should now include a comment about this patch also resolving the issue that Anatol reported yesterday?

-Aaron

Re: [PATCH] lpc_ich: use devres API to allocate private data

[Samuel Ortiz]

Hi Arron,

On Thu, Feb 14, 2013 at 11:35:04AM -0600, Aaron Sierra wrote:
> 
> Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
> ---
>  drivers/mfd/lpc_ich.c |    7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
Applied, thanks.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/