summaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>2010-08-20 09:25:00 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-24 15:20:39 +0200
commit2aa9be448dab7433c685b634a4049289cb1913d3 (patch)
tree6cd1c0d6f1ec58665c1dc1ec2983177de750940e /drivers/edac
parenti7core_edac: Introduce alloc_i7core_dev (diff)
downloadlinux-2aa9be448dab7433c685b634a4049289cb1913d3.tar.xz
linux-2aa9be448dab7433c685b634a4049289cb1913d3.zip
i7core_edac: Introduce free_i7core_dev
Have a method to make a couple with alloc_i7core_dev() previously introduced. Using in pair will help proper resource handling. Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/i7core_edac.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index c4fa112271e5..e1cbbbad466e 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -470,6 +470,13 @@ static struct i7core_dev *alloc_i7core_dev(u8 socket,
return i7core_dev;
}
+static void free_i7core_dev(struct i7core_dev *i7core_dev)
+{
+ list_del(&i7core_dev->list);
+ kfree(i7core_dev->pdev);
+ kfree(i7core_dev);
+}
+
/****************************************************************************
Memory check routines
****************************************************************************/
@@ -1265,7 +1272,6 @@ static void i7core_put_devices(struct i7core_dev *i7core_dev)
PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
pci_dev_put(pdev);
}
- kfree(i7core_dev->pdev);
}
static void i7core_put_all_devices(void)
@@ -1274,8 +1280,7 @@ static void i7core_put_all_devices(void)
list_for_each_entry_safe(i7core_dev, tmp, &i7core_edac_list, list) {
i7core_put_devices(i7core_dev);
- list_del(&i7core_dev->list);
- kfree(i7core_dev);
+ free_i7core_dev(i7core_dev);
}
}
@@ -2106,8 +2111,7 @@ static void __devexit i7core_remove(struct pci_dev *pdev)
/* Release PCI resources */
i7core_put_devices(i7core_dev);
- list_del(&i7core_dev->list);
- kfree(i7core_dev);
+ free_i7core_dev(i7core_dev);
}
}
probed--;