From 88ef5ea9767b0c7bfb4b477e1857629fe8fa2983 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 20 Aug 2010 15:39:38 -0300 Subject: i7core_edac: it is safe to i7core_unregister_mci() when mci=NULL i7core_unregister_mci() checks internally when mci=NULL. There's no need to test it outside. Signed-off-by: Mauro Carvalho Chehab --- drivers/edac/i7core_edac.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'drivers/edac/i7core_edac.c') diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 915835339d7..d55f74a6cd4 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c @@ -2091,10 +2091,9 @@ static int __devinit i7core_probe(struct pci_dev *pdev, return 0; fail1: - list_for_each_entry(i7core_dev, &i7core_edac_list, list) { - if (i7core_dev->mci) - i7core_unregister_mci(i7core_dev); - } + list_for_each_entry(i7core_dev, &i7core_edac_list, list) + i7core_unregister_mci(i7core_dev); + i7core_put_all_devices(); fail0: mutex_unlock(&i7core_edac_lock); @@ -2126,10 +2125,8 @@ static void __devexit i7core_remove(struct pci_dev *pdev) return; } - list_for_each_entry(i7core_dev, &i7core_edac_list, list) { - if (i7core_dev->mci) - i7core_unregister_mci(i7core_dev); - } + list_for_each_entry(i7core_dev, &i7core_edac_list, list) + i7core_unregister_mci(i7core_dev); /* Release PCI resources */ i7core_put_all_devices(); -- cgit v1.2.3