lkml.org 
[lkml]   [2005]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH 4/6] include, sound: pci_find_device remove (s/pci/au88x0/au88x0.c)
    From


    Generated in 2.6.13-mm1 kernel version.

    Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz>

    au88x0.c | 26 ++++++++++++++++----------
    1 files changed, 16 insertions(+), 10 deletions(-)

    diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
    --- a/sound/pci/au88x0/au88x0.c
    +++ b/sound/pci/au88x0/au88x0.c
    @@ -79,19 +79,21 @@ static void vortex_fix_agp_bridge(struct

    static void __devinit snd_vortex_workaround(struct pci_dev *vortex, int fix)
    {
    - struct pci_dev *via;
    + struct pci_dev *via = NULL;

    /* autodetect if workarounds are required */
    if (fix == 255) {
    /* VIA KT133 */
    - via = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8365_1, NULL);
    + via = pci_get_device(PCI_VENDOR_ID_VIA,
    + PCI_DEVICE_ID_VIA_8365_1, NULL);
    /* VIA Apollo */
    if (via == NULL) {
    - via = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C598_1, NULL);
    - }
    - /* AMD Irongate */
    - if (via == NULL) {
    - via = pci_find_device(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_FE_GATE_7007, NULL);
    + via = pci_get_device(PCI_VENDOR_ID_VIA,
    + PCI_DEVICE_ID_VIA_82C598_1, NULL);
    + /* AMD Irongate */
    + if (via == NULL)
    + via = pci_get_device(PCI_VENDOR_ID_AMD,
    + PCI_DEVICE_ID_AMD_FE_GATE_7007, NULL);
    }
    if (via) {
    printk(KERN_INFO CARD_NAME ": Activating latency workaround...\n");
    @@ -101,13 +103,17 @@ static void __devinit snd_vortex_workaro
    } else {
    if (fix & 0x1)
    vortex_fix_latency(vortex);
    - if ((fix & 0x2) && (via = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8365_1, NULL)))
    + if ((fix & 0x2) && (via = pci_get_device(PCI_VENDOR_ID_VIA,
    + PCI_DEVICE_ID_VIA_8365_1, NULL)))
    vortex_fix_agp_bridge(via);
    - if ((fix & 0x4) && (via = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C598_1, NULL)))
    + if ((fix & 0x4) && (via = pci_get_device(PCI_VENDOR_ID_VIA,
    + PCI_DEVICE_ID_VIA_82C598_1, NULL)))
    vortex_fix_agp_bridge(via);
    - if ((fix & 0x8) && (via = pci_find_device(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_FE_GATE_7007, NULL)))
    + if ((fix & 0x8) && (via = pci_get_device(PCI_VENDOR_ID_AMD,
    + PCI_DEVICE_ID_AMD_FE_GATE_7007, NULL)))
    vortex_fix_agp_bridge(via);
    }
    + pci_dev_put(via);
    }

    // component-destructor
    -
    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/
    \
     
     \ /
      Last update: 2005-09-02 23:49    [W:0.061 / U:0.880 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site