Re: [PATCH] PCI fixes for 2.6.10-rc1
From: Greg KH (greg_at_kroah.com)
Date: 11/13/04
- Previous message: Benjamin Herrenschmidt: "Re: [Linux-fbdev-devel] Re: [PATCH] fbdev: Fix IO access in rivafb"
- In reply to: Greg KH: "Re: [PATCH] PCI fixes for 2.6.10-rc1"
- Next in thread: Greg KH: "Re: [PATCH] PCI fixes for 2.6.10-rc1"
- Reply: Greg KH: "Re: [PATCH] PCI fixes for 2.6.10-rc1"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Fri, 12 Nov 2004 15:21:57 -0800 To: linux-kernel@vger.kernel.org
ChangeSet 1.2026.66.20, 2004/11/10 16:44:40-08:00, hannal@us.ibm.com
[PATCH] ide.c: replace pci_find_device with pci_dev_present
As pci_find_device is going away it needs to be replaced. In this case the dev
returned from pci_find_device was not being used so pci_dev_present was the
appropriate replacement.
This has been compile and boot tested on a T22.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/ide/ide.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)
diff -Nru a/drivers/ide/ide.c b/drivers/ide/ide.c
--- a/drivers/ide/ide.c 2004-11-12 15:12:26 -08:00
+++ b/drivers/ide/ide.c 2004-11-12 15:12:26 -08:00
@@ -335,11 +335,16 @@
int ide_system_bus_speed (void)
{
+ static struct pci_device_id pci_default[] = {
+ { PCI_DEVICE(PCI_ANY_ID, PCI_ANY_ID) },
+ { }
+ };
+
if (!system_bus_speed) {
if (idebus_parameter) {
/* user supplied value */
system_bus_speed = idebus_parameter;
- } else if (pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL) != NULL) {
+ } else if (pci_dev_present(pci_default)) {
/* safe default value for PCI */
system_bus_speed = 33;
} else {
-
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/
- Previous message: Benjamin Herrenschmidt: "Re: [Linux-fbdev-devel] Re: [PATCH] fbdev: Fix IO access in rivafb"
- In reply to: Greg KH: "Re: [PATCH] PCI fixes for 2.6.10-rc1"
- Next in thread: Greg KH: "Re: [PATCH] PCI fixes for 2.6.10-rc1"
- Reply: Greg KH: "Re: [PATCH] PCI fixes for 2.6.10-rc1"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
|
