[PATCH] Tulip driver fails to link (2.5.48)

[PATCH] Tulip driver fails to link (2.5.48)

[Peter Chubb]

Hi,
	In the tulip driver,  the .remove entry of struct pci_driveris
declared __devexit_p but the function  is declared __exit.  This
causes a relocation error when building as a built-in (not a module),
when CONFIG_HOTPLUG is defined.

===== drivers/net/tulip/de2104x.c 1.12 vs edited =====
--- 1.12/drivers/net/tulip/de2104x.c    Wed Nov  6 05:19:30 2002
+++ edited/drivers/net/tulip/de2104x.c  Mon Nov 18 21:14:47 2002
@@ -2137,7 +2137,7 @@
	return rc;
 }
 
-static void __exit de_remove_one (struct pci_dev *pdev)
+static void __devexit de_remove_one (struct pci_dev *pdev)
 {
	struct net_device *dev = pci_get_drvdata(pdev);
 	struct de_private *de = dev->priv;

Re: [PATCH] Tulip driver fails to link (2.5.48)

[Jeff Garzik]

Peter Chubb wrote:

> Hi,
> 	In the tulip driver,  the .remove entry of struct pci_driveris
> declared __devexit_p but the function  is declared __exit.  This
> causes a relocation error when building as a built-in (not a module),
> when CONFIG_HOTPLUG is defined.


Yes...  alan snuck that __devexit_p usage in there ;-)

We need to create __exit_p as the #warning indicates, because this 
driver does not support CONFIG_HOTPLUG intentionally.  For now, I think 
it is better to add #ifdef MODULE to the driver in struct pci_driver 
definition, because using "__devexit" as in your patch is incorrect.

So if you wanted to submit the patch changing __devexit_p to #ifdef 
MODULE, that could probably be applied...

	Jeff