lkml.org 
[lkml]   [2004]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2.6.9-rc2-mm4 bttv-driver.c][4/8] convert pci_find_device to pci_dev_present

    As pci_find_device is going away need to replace it. This file did not use the dev returned
    from pci_find_device so is replaceable by pci_dev_present. I was not able to test it
    as I do not have the hardware.

    Hanna Linder
    IBM Linux Technology Center

    Signed-off-by: Hanna Linder <hannal@us.ibm.com>

    diff -Nrup linux-2.6.9-rc2-mm4cln/drivers/media/video/bttv-driver.c linux-2.6.9-rc2-mm4patch/drivers/media/video/bttv-driver.c
    --- linux-2.6.9-rc2-mm4cln/drivers/media/video/bttv-driver.c 2004-09-28 14:58:35.000000000 -0700
    +++ linux-2.6.9-rc2-mm4patch/drivers/media/video/bttv-driver.c 2004-09-29 13:08:59.369697520 -0700
    @@ -4012,6 +4012,10 @@ static int bttv_init_module(void)
    {
    int rc;
    bttv_num = 0;
    + static struct pci_device_id cx2388x[] {
    + { PCI_DEVICE(0x14f1, 0x8800) },
    + { },
    + };

    printk(KERN_INFO "bttv: driver version %d.%d.%d loaded\n",
    (BTTV_VERSION_CODE >> 16) & 0xff,
    @@ -4036,7 +4040,7 @@ static int bttv_init_module(void)
    rc = pci_module_init(&bttv_pci_driver);
    if (-ENODEV == rc) {
    /* plenty of people trying to use bttv for the cx2388x ... */
    - if (NULL != pci_find_device(0x14f1, 0x8800, NULL))
    + if (pci_dev_present(cx2388x))
    printk("bttv doesn't support your Conexant 2388x card.\n");
    }
    return rc;
    -
    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-03-22 14:06    [W:0.022 / U:3.076 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site