Skip to contentSkip to conversation

pc300_drv.c: mark a function pointer as __devexit_p

PATCH New Adrian Bunk 1 participant 1 message Jan 25, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pc300_drv.c: mark a function pointer as __devexit_p

I got the following link error in 2.4.25-pre7 when trying to compile drivers/net/wan/pc300_drv.c statically into a kernel with CONFIG_HOTPLUG=n :

<-- snip -->

...
-o vmlinux
local symbol 0: discarded in section `.text.exit' from drivers/net/wan/wan.o
make: *** [vmlinux] Error 1

<-- snip -->

The patch below fixes this issue by marking the function pointer with __devexit_p .

I also did the following changes to this struct:
- added indentation
- switched to C99 initializers
- removed two unneeded NULL's

Please apply
Adrian

drivers/net/wan/pc300_drv.c renamed from drivers/net/wan/pc300_drv.c.old +4 -6
@@ -3459,12 +3459,10 @@
 }
 
 static struct pci_driver cpc_driver = {
-	name:"pc300",
-	id_table:cpc_pci_dev_id,
-	probe:cpc_init_one,
-	remove:cpc_remove_one,
-	suspend:NULL,
-	resume:NULL,
+	.name		= "pc300",
+	.id_table	= cpc_pci_dev_id,
+	.probe		= cpc_init_one,
+	.remove		= __devexit_p(cpc_remove_one),
 };
 
 static int __init cpc_init(void)