* [PATCH 2.6.9-rc2-mm4 ibmphp_core.c][6/8] replace pci_get_device with pci_dev_present
@ 2004-09-29 23:35 Hanna Linder
2004-10-20 22:57 ` [Kernel-janitors] " maximilian attems
0 siblings, 1 reply; 2+ messages in thread
From: Hanna Linder @ 2004-09-29 23:35 UTC (permalink / raw)
To: linux-kernel; +Cc: kernel-janitors, hannal, greg
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;
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 ibmphp_core.c][6/8] replace pci_get_device with pci_dev_present
2004-09-29 23:35 [PATCH 2.6.9-rc2-mm4 ibmphp_core.c][6/8] replace pci_get_device with pci_dev_present Hanna Linder
@ 2004-10-20 22:57 ` maximilian attems
0 siblings, 0 replies; 2+ messages in thread
From: maximilian attems @ 2004-10-20 22:57 UTC (permalink / raw)
To: Hanna Linder; +Cc: linux-kernel, kernel-janitors, greg
On Wed, 29 Sep 2004, Hanna Linder wrote:
>
> 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) },
> + { },
> + };
^^^^
white space damaged
>
> 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;
>
first timer for your patches.
corrected for next kjt.
--
maks
kernel janitor http://janitor.kernelnewbies.org/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-10-20 23:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-09-29 23:35 [PATCH 2.6.9-rc2-mm4 ibmphp_core.c][6/8] replace pci_get_device with pci_dev_present Hanna Linder
2004-10-20 22:57 ` [Kernel-janitors] " maximilian attems
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome