2004-10-21 18:42:53

by Hanna Linder

Subject: [PATCH 2.6] cyclades.c: replace pci_find_device

As pci_find_device is going away I've replaced it with pci_get_device.
If someone with this hardware could test it I would appreciate it.

Thanks.

Hanna Linder
IBM Linux Technology Center

Signed-off-by: Hanna Linder <[email protected]>

---
diff -Nrup linux-2.6.9cln/drivers/char/cyclades.c linux-2.6.9patch/drivers/char/cyclades.c
--- linux-2.6.9cln/drivers/char/cyclades.c 2004-10-18 16:35:53.000000000 -0700
+++ linux-2.6.9patch/drivers/char/cyclades.c 2004-10-20 15:31:49.803025392 -0700
@@ -4765,7 +4765,7 @@ cy_detect_pci(void)
for (i = 0; i < NR_CARDS; i++) {
/* look for a Cyclades card by vendor and device id */
while((device_id = cy_pci_dev_id[dev_index]) != 0) {
- if((pdev = pci_find_device(PCI_VENDOR_ID_CYCLADES,
+ if((pdev = pci_get_device(PCI_VENDOR_ID_CYCLADES,
device_id, pdev)) == NULL) {
dev_index++; /* try next device id */
} else {

2004-10-24 18:43:30

by Scott Feldman

Subject: Re: [KJ] [PATCH 2.6] cyclades.c: replace pci_find_device

On Thu, 2004-10-21 at 11:35, Hanna Linder wrote:
> diff -Nrup linux-2.6.9cln/drivers/char/cyclades.c linux-2.6.9patch/drivers/char/cyclades.c
> --- linux-2.6.9cln/drivers/char/cyclades.c 2004-10-18 16:35:53.000000000 -0700
> +++ linux-2.6.9patch/drivers/char/cyclades.c 2004-10-20 15:31:49.803025392 -0700
> @@ -4765,7 +4765,7 @@ cy_detect_pci(void)
> for (i = 0; i < NR_CARDS; i++) {
> /* look for a Cyclades card by vendor and device id */
> while((device_id = cy_pci_dev_id[dev_index]) != 0) {
> - if((pdev = pci_find_device(PCI_VENDOR_ID_CYCLADES,
> + if((pdev = pci_get_device(PCI_VENDOR_ID_CYCLADES,
> device_id, pdev)) == NULL) {
> dev_index++; /* try next device id */
> } else {

If there are NR_CARDS (or more) in the system, this will leave a pdev on
the table. A pci_dev_put after the for-loop should catch it.

-scott

2004-11-05 23:22:15

by Greg KH

Subject: Re: [PATCH 2.6] cyclades.c: replace pci_find_device

On Thu, Oct 21, 2004 at 11:35:49AM -0700, Hanna Linder wrote:
>
> As pci_find_device is going away I've replaced it with pci_get_device.
> If someone with this hardware could test it I would appreciate it.
>
> Thanks.
>
> Hanna Linder
> IBM Linux Technology Center
>
> Signed-off-by: Hanna Linder <[email protected]>


Applied, thanks.

greg k-h