[PATCH 2.6.9-rc2-mm4 ibmphp_core.c][6/8] replace pci_get_device with pci_dev_present

From: Hanna Linder (hannal_at_us.ibm.com)
Date: 09/30/04

  • Next message: Judith Lebzelter: "OSDL aio-stress results on latest kernels show buffered random read issue" 
    Date:	Wed, 29 Sep 2004 16:35:31 -0700
To: linux-kernel@vger.kernel.org

    This can be converted to pci_dev_present as the dev returned is never used.
    Compile tested.

    Hanna Linder
    IBM Linux Technology Center

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

    diff -Nrup linux-2.6.9-rc2-mm4cln/drivers/pci/hotplug/ibmphp_core.c linux-2.6.9-rc2-mm4patch2/drivers/pci/hotplug/ibmphp_core.c
    --- linux-2.6.9-rc2-mm4cln/drivers/pci/hotplug/ibmphp_core.c 2004-09-28 14:58:50.000000000 -0700
    +++ linux-2.6.9-rc2-mm4patch2/drivers/pci/hotplug/ibmphp_core.c 2004-09-29 15:39:39.385406240 -0700
    @@ -838,8 +838,11 @@ static int set_bus (struct slot * slot_c
             int rc;
             u8 speed;
             u8 cmd = 0x0;
    - struct pci_dev *dev = NULL;
             int retval;
    + static struct pci_device_id ciobx[] = {
    + { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, 0x0101) },
    + { },
    + };
     
             debug ("%s - entry slot # %d\n", __FUNCTION__, slot_cur->number);
             if (SET_BUS_STATUS (slot_cur->ctrl) && is_bus_empty (slot_cur)) {
    @@ -886,8 +889,7 @@ static int set_bus (struct slot * slot_c
                                     break;
                             case BUS_SPEED_133:
                                     /* This is to take care of the bug in CIOBX chip */
    - while ((dev = pci_get_device(PCI_VENDOR_ID_SERVERWORKS,
    - 0x0101, dev)) != NULL)
    + if(pci_dev_present(ciobx))
                                             ibmphp_hpc_writeslot (slot_cur, HPC_BUS_100PCIXMODE);
                                     cmd = HPC_BUS_133PCIXMODE;
                                     break;

    -
    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: Judith Lebzelter: "OSDL aio-stress results on latest kernels show buffered random read issue"

    Relevant Pages