Re: [PATCH] PCI fixes for 2.6.9

From: Greg KH (greg_at_kroah.com)
Date: 10/20/04

  • Next message: Greg KH: "Re: [PATCH] PCI fixes for 2.6.9" 
    Date:	Tue, 19 Oct 2004 15:42:12 -0700
To: linux-kernel@vger.kernel.org

    ChangeSet 1.1997.37.1, 2004/10/06 11:17:12-07:00, greg@kroah.com

    [PATCH] PCI: remove pci_find_subsys() calls from cpufreq code.

    Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

     arch/i386/kernel/cpu/cpufreq/speedstep-ich.c | 15 ++++++++++-----
     1 files changed, 10 insertions(+), 5 deletions(-)

    diff -Nru a/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c b/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
    --- a/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c 2004-10-19 15:27:53 -07:00
    +++ b/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c 2004-10-19 15:27:53 -07:00
    @@ -171,7 +171,7 @@
      */
     static unsigned int speedstep_detect_chipset (void)
     {
    - speedstep_chipset_dev = pci_find_subsys(PCI_VENDOR_ID_INTEL,
    + speedstep_chipset_dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
                                   PCI_DEVICE_ID_INTEL_82801DB_12,
                                   PCI_ANY_ID,
                                   PCI_ANY_ID,
    @@ -179,7 +179,7 @@
             if (speedstep_chipset_dev)
                     return 4; /* 4-M */
     
    - speedstep_chipset_dev = pci_find_subsys(PCI_VENDOR_ID_INTEL,
    + speedstep_chipset_dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
                                   PCI_DEVICE_ID_INTEL_82801CA_12,
                                   PCI_ANY_ID,
                                   PCI_ANY_ID,
    @@ -188,7 +188,7 @@
                     return 3; /* 3-M */
     
     
    - speedstep_chipset_dev = pci_find_subsys(PCI_VENDOR_ID_INTEL,
    + speedstep_chipset_dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
                                   PCI_DEVICE_ID_INTEL_82801BA_10,
                                   PCI_ANY_ID,
                                   PCI_ANY_ID,
    @@ -201,7 +201,7 @@
                     static struct pci_dev *hostbridge;
                     u8 rev = 0;
     
    - hostbridge = pci_find_subsys(PCI_VENDOR_ID_INTEL,
    + hostbridge = pci_get_subsys(PCI_VENDOR_ID_INTEL,
                                   PCI_DEVICE_ID_INTEL_82815_MC,
                                   PCI_ANY_ID,
                                   PCI_ANY_ID,
    @@ -214,9 +214,11 @@
                     if (rev < 5) {
                             dprintk(KERN_INFO "cpufreq: hostbridge does not support speedstep\n");
                             speedstep_chipset_dev = NULL;
    + pci_dev_put(hostbridge);
                             return 0;
                     }
     
    + pci_dev_put(hostbridge);
                     return 2; /* 2-M */
             }
     
    @@ -411,8 +413,10 @@
             }
     
             /* activate speedstep support */
    - if (speedstep_activate())
    + if (speedstep_activate()) {
    + pci_dev_put(speedstep_chipset_dev);
                     return -EINVAL;
    + }
     
             return cpufreq_register_driver(&speedstep_driver);
     }
    @@ -425,6 +429,7 @@
      */
     static void __exit speedstep_exit(void)
     {
    + pci_dev_put(speedstep_chipset_dev);
             cpufreq_unregister_driver(&speedstep_driver);
     }
     

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  • Next message: Greg KH: "Re: [PATCH] PCI fixes for 2.6.9"

    Relevant Pages