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 5/6] include, sound: pci_find_device remove (s/pci/cs46xx/cs46xx_lib.c)
    From


    Generated in 2.6.13-mm1 kernel version.

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

    include/sound/cs46xx.h | 1 -
    sound/pci/cs46xx/cs46xx_lib.c | 13 +++++++++----
    2 files changed, 9 insertions(+), 5 deletions(-)

    diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h
    --- a/include/sound/cs46xx.h
    +++ b/include/sound/cs46xx.h
    @@ -1715,7 +1715,6 @@ struct _snd_cs46xx {
    void (*active_ctrl)(cs46xx_t *, int);
    void (*mixer_init)(cs46xx_t *);

    - struct pci_dev *acpi_dev;
    int acpi_port;
    snd_kcontrol_t *eapd_switch; /* for amplifier hack */
    int accept_valid; /* accept mmap valid (for OSS) */
    diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
    --- a/sound/pci/cs46xx/cs46xx_lib.c
    +++ b/sound/pci/cs46xx/cs46xx_lib.c
    @@ -3548,7 +3548,7 @@ static void clkrun_hack(cs46xx_t *chip,
    {
    u16 control, nval;

    - if (chip->acpi_dev == NULL)
    + if (!chip->acpi_port)
    return;

    chip->amplifier += change;
    @@ -3571,15 +3571,20 @@ static void clkrun_hack(cs46xx_t *chip,
    */
    static void clkrun_init(cs46xx_t *chip)
    {
    + struct pci_dev *pdev;
    u8 pp;

    - chip->acpi_dev = pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, NULL);
    - if (chip->acpi_dev == NULL)
    + chip->acpi_port = 0;
    +
    + pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
    + PCI_DEVICE_ID_INTEL_82371AB_3, NULL);
    + if (pdev == NULL)
    return; /* Not a thinkpad thats for sure */

    /* Find the control port */
    - pci_read_config_byte(chip->acpi_dev, 0x41, &pp);
    + pci_read_config_byte(pdev, 0x41, &pp);
    chip->acpi_port = pp << 8;
    + pci_dev_put(pdev);
    }


    -
    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.022 / U:2.652 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site