]> err.no Git - linux-2.6/commitdiff
[PATCH] EDAC: amd76x pci_dev_get/pci_dev_put fixes
authorDave Peterson <dsp@llnl.gov>
Sun, 26 Mar 2006 09:38:41 +0000 (01:38 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 26 Mar 2006 16:57:06 +0000 (08:57 -0800)
Eliminate unnecessary calls to pci_dev_get() and pci_dev_put() from
amd76x driver.

Signed-off-by: David S. Peterson <dsp@llnl.gov>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/edac/amd76x_edac.c

index da171a56b6365f7b72776f649cbd8e634a0289b1..6b7a441f0482ff7cfce5881befb909d8ebd46ff5 100644 (file)
@@ -226,7 +226,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
 
        debugf0("%s(): mci = %p\n", __func__, mci);
 
-       mci->pdev = pci_dev_get(pdev);
+       mci->pdev = pdev;
        mci->mtype_cap = MEM_FLAG_RDDR;
 
        mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
@@ -284,11 +284,8 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
        return 0;
 
 fail:
-       if (mci) {
-               if(mci->pdev)
-                       pci_dev_put(mci->pdev);
+       if (mci != NULL)
                edac_mc_free(mci);
-       }
        return rc;
 }
 
@@ -322,7 +319,6 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
                return;
        if (edac_mc_del_mc(mci))
                return;
-       pci_dev_put(mci->pdev);
        edac_mc_free(mci);
 }