From: Aaron Sierra Date: Thu, 14 Feb 2013 17:35:04 +0000 (-0600) Subject: mfd: lpc_ich: Use devres API to allocate private data X-Git-Tag: firefly_0821_release~3680^2~1045^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ff7109fa632654eaef657186f2942f5b679023d6;p=firefly-linux-kernel-4.4.55.git mfd: lpc_ich: Use devres API to allocate private data And fix a kzalloc argument inversion bug while converting to devres. Signed-off-by: Aaron Sierra Signed-off-by: Samuel Ortiz --- diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c index 5c2ef41fa24c..9f12f91d6296 100644 --- a/drivers/mfd/lpc_ich.c +++ b/drivers/mfd/lpc_ich.c @@ -916,7 +916,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; @@ -952,7 +953,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; } @@ -961,12 +961,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 = {