Skip to contentSkip to conversation

fix .text.exit error in drivers/net/r8169.c

PATCH In review Adrian Bunk 2 participants 2 messages Mar 27, 2003 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix .text.exit error in drivers/net/r8169.c

In drivers/net/r8169.c the function rtl8169_remove_one is __devexit but the pointer to it didn't use __devexit_p resulting in a.text.exit compile error when !CONFIG_HOTPLUG.

The fix is simple:

drivers/net/r8169.c renamed from drivers/net/r8169.c.old +1 -1
@@ -1110,7 +1110,7 @@
 	.name		= MODULENAME,
 	.id_table	= rtl8169_pci_tbl,
 	.probe		= rtl8169_init_one,
-	.remove		= rtl8169_remove_one,
+	.remove		= __devexit_p(rtl8169_remove_one),
 	.suspend	= NULL,
 	.resume		= NULL,
 };

The patch applies against 2.4.21-pre6 and 2.5.66. I've tested the compilation with 2.4.21-pre6.

Please apply
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#1 lore raw
Quoted 6 lines · Adrian Bunk

In drivers/net/r8169.c the function rtl8169_remove_one is __devexit but the pointer to it didn't use __devexit_p resulting in a.text.exit compile error when !CONFIG_HOTPLUG.

The fix is simple:

Looks good, will apply. Thanks.

Jeff