Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 461c078c authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

[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: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 95047dd6

drivers/net/wireless/orinoco_nortel.c

+3 −2
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev, 
		err = -EBUSY;

		goto fail_irq;

	}

	orinoco_pci_setup_netdev(dev, pdev, 2);



	err = orinoco_nortel_hw_init(card);

	if (err) {
@@ -227,6 +226,8 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev, 
	}



	pci_set_drvdata(pdev, dev);

	printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name,

	       pci_name(pdev));



	return 0;
@@ -265,7 +266,7 @@ static void __devexit orinoco_nortel_remove_one(struct pci_dev *pdev) 
	iowrite16(0, card->bridge_io + 10);



	unregister_netdev(dev);

	free_irq(dev->irq, dev);

	free_irq(pdev->irq, dev);

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(dev);

	pci_iounmap(pdev, priv->hw.iobase);

drivers/net/wireless/orinoco_pci.c

+3 −2
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, 
		err = -EBUSY;

		goto fail_irq;

	}

	orinoco_pci_setup_netdev(dev, pdev, 0);



	err = orinoco_pci_cor_reset(priv);

	if (err) {
@@ -176,6 +175,8 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, 
	}



	pci_set_drvdata(pdev, dev);

	printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name,

	       pci_name(pdev));



	return 0;
@@ -204,7 +205,7 @@ static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev) 
	struct orinoco_private *priv = netdev_priv(dev);



	unregister_netdev(dev);

	free_irq(dev->irq, dev);

	free_irq(pdev->irq, dev);

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(dev);

	pci_iounmap(pdev, priv->hw.iobase);

drivers/net/wireless/orinoco_pci.h

+0 −26
Original line number Diff line number Diff line
@@ -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)

{

drivers/net/wireless/orinoco_plx.c

+3 −2
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ static int orinoco_plx_init_one(struct pci_dev *pdev, 
		err = -EBUSY;

		goto fail_irq;

	}

	orinoco_pci_setup_netdev(dev, pdev, 2);



	err = orinoco_plx_hw_init(card);

	if (err) {
@@ -266,6 +265,8 @@ static int orinoco_plx_init_one(struct pci_dev *pdev, 
	}



	pci_set_drvdata(pdev, dev);

	printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name,

	       pci_name(pdev));



	return 0;
@@ -301,7 +302,7 @@ static void __devexit orinoco_plx_remove_one(struct pci_dev *pdev) 
	struct orinoco_pci_card *card = priv->card;



	unregister_netdev(dev);

	free_irq(dev->irq, dev);

	free_irq(pdev->irq, dev);

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(dev);

	pci_iounmap(pdev, priv->hw.iobase);

drivers/net/wireless/orinoco_tmd.c

+3 −2
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev, 
		err = -EBUSY;

		goto fail_irq;

	}

	orinoco_pci_setup_netdev(dev, pdev, 2);



	err = orinoco_tmd_cor_reset(priv);

	if (err) {
@@ -162,6 +161,8 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev, 
	}



	pci_set_drvdata(pdev, dev);

	printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name,

	       pci_name(pdev));



	return 0;
@@ -194,7 +195,7 @@ static void __devexit orinoco_tmd_remove_one(struct pci_dev *pdev) 
	struct orinoco_pci_card *card = priv->card;



	unregister_netdev(dev);

	free_irq(dev->irq, dev);

	free_irq(pdev->irq, dev);

	pci_set_drvdata(pdev, NULL);

	free_orinocodev(dev);

	pci_iounmap(pdev, priv->hw.iobase);