lkml.org 
[lkml]   [2005]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH -mm 1/2] removes pci_find_device from i6300esb.c
    From
    This patch changes pci_find_device to pci_get_device (encapsulated in
    for_each_pci_dev) in i6300esb watchdog card with appropriate adding pci_dev_put.

    Generated in 2.6.13-rc5-mm1 kernel version.

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

    diff --git a/drivers/char/watchdog/i6300esb.c b/drivers/char/watchdog/i6300esb.c
    --- a/drivers/char/watchdog/i6300esb.c
    +++ b/drivers/char/watchdog/i6300esb.c
    @@ -368,12 +368,11 @@ static unsigned char __init esb_getdevic
    * Find the PCI device
    */

    - while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
    + for_each_pci_dev(dev)
    if (pci_match_id(esb_pci_tbl, dev)) {
    esb_pci = dev;
    break;
    }
    - }

    if (esb_pci) {
    if (pci_enable_device(esb_pci)) {
    @@ -430,6 +429,7 @@ err_release:
    pci_release_region(esb_pci, 0);
    err_disable:
    pci_disable_device(esb_pci);
    + pci_dev_put(esb_pci);
    }
    out:
    return 0;
    @@ -481,6 +481,7 @@ err_unmap:
    pci_release_region(esb_pci, 0);
    /* err_disable: */
    pci_disable_device(esb_pci);
    + pci_dev_put(esb_pci);
    /* out: */
    return ret;
    }
    @@ -497,6 +498,7 @@ static void __exit watchdog_cleanup (voi
    iounmap(BASEADDR);
    pci_release_region(esb_pci, 0);
    pci_disable_device(esb_pci);
    + pci_dev_put(esb_pci);
    }

    module_init(watchdog_init);
    -
    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-08-10 02:12    [W:0.026 / U:2.008 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site