diff options
author | Pavel Roskin <proski@gnu.org> | 2006-05-01 08:13:33 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-05-05 23:10:41 +0200 |
commit | 461c078c9cdfc1d24a436a87daed90f18c3b0d0d (patch) | |
tree | 90b08022254282c74cba106e0d94431ad31dc598 /drivers/net/wireless/orinoco_pci.h | |
parent | [PATCH] orinoco: eliminate the suspend/resume functions if CONFIG_PM is unset (diff) | |
download | linux-461c078c9cdfc1d24a436a87daed90f18c3b0d0d.tar.xz linux-461c078c9cdfc1d24a436a87daed90f18c3b0d0d.zip |
[PATCH] orinoco: don't put PCI resource data to the network device
The resource data in the network device is intended for ISA and other
older busses, but not for PCI. Don't put PCI data there. Don't (ab)use
the network device for keeping the IRQ number.
Retire orinoco_pci_setup_netdev(), and print some minimal information to
the kernel log instead, identifying the network device and the driver
mostly to identify problems at startup. Scripts should rely on sysfs.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco_pci.h')
-rw-r--r-- | drivers/net/wireless/orinoco_pci.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/drivers/net/wireless/orinoco_pci.h b/drivers/net/wireless/orinoco_pci.h index 4e8da4ea29f1..7eb1e08113e0 100644 --- a/drivers/net/wireless/orinoco_pci.h +++ b/drivers/net/wireless/orinoco_pci.h @@ -18,32 +18,6 @@ struct orinoco_pci_card { void __iomem *attr_io; }; -/* Set base address or memory range of the network device based on - * the PCI device it's using. Specify BAR of the "main" resource. - * To be used after request_irq(). */ -static inline void orinoco_pci_setup_netdev(struct net_device *dev, - struct pci_dev *pdev, int bar) -{ - char *range_type; - unsigned long start = pci_resource_start(pdev, bar); - unsigned long len = pci_resource_len(pdev, bar); - unsigned long flags = pci_resource_flags(pdev, bar); - unsigned long end = start + len - 1; - - dev->irq = pdev->irq; - if (flags & IORESOURCE_IO) { - dev->base_addr = start; - range_type = "ports"; - } else { - dev->mem_start = start; - dev->mem_end = end; - range_type = "memory"; - } - - printk(KERN_DEBUG PFX "%s: irq %d, %s 0x%lx-0x%lx\n", - pci_name(pdev), pdev->irq, range_type, start, end); -} - #ifdef CONFIG_PM static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state) { |