Commit 917b32b2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

PCI: remove pci_present() from drivers/net/saa9730.c

parent f7ed0c8b
......@@ -1050,31 +1050,30 @@ static int lan_saa9730_init(struct net_device *dev, int ioaddr, int irq)
static int __init saa9730_probe(void)
{
struct net_device *dev = NULL;
struct pci_dev *pdev = NULL;
if (pci_present()) {
struct pci_dev *pdev = NULL;
if (lan_saa9730_debug > 1)
printk
("saa9730.c: PCI bios is present, checking for devices...\n");
if (lan_saa9730_debug > 1)
printk
("saa9730.c: PCI bios is present, checking for devices...\n");
while ((pdev = pci_find_device(PCI_VENDOR_ID_PHILIPS,
PCI_DEVICE_ID_PHILIPS_SAA9730,
pdev))) {
unsigned int pci_ioaddr;
while ((pdev = pci_find_device(PCI_VENDOR_ID_PHILIPS,
PCI_DEVICE_ID_PHILIPS_SAA9730,
pdev))) {
unsigned int pci_ioaddr;
pci_irq_line = pdev->irq;
/* LAN base address in located at BAR 1. */
pci_irq_line = pdev->irq;
/* LAN base address in located at BAR 1. */
pci_ioaddr = pci_resource_start(pdev, 1);
pci_set_master(pdev);
pci_ioaddr = pci_resource_start(pdev, 1);
pci_set_master(pdev);
printk("Found SAA9730 (PCI) at %#x, irq %d.\n",
pci_ioaddr, pci_irq_line);
if (!lan_saa9730_init
(dev, pci_ioaddr, pci_irq_line)) return 0;
else
printk("Lan init failed.\n");
}
printk("Found SAA9730 (PCI) at %#x, irq %d.\n",
pci_ioaddr, pci_irq_line);
if (!lan_saa9730_init
(dev, pci_ioaddr, pci_irq_line))
return 0;
else
printk("Lan init failed.\n");
}
return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment