Skip to contentSkip to conversation

pcmcia-badge4-avoid-unused-function-warning.patch removed from -mm tree

merged [email protected] 1 participant 1 message Nov 20, 2017

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: drivers/pcmcia/sa1111_badge4.c: avoid unused function warning
has been removed from the -mm tree. Its filename was
pcmcia-badge4-avoid-unused-function-warning.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Arnd Bergmann <[email protected]>
Subject: drivers/pcmcia/sa1111_badge4.c: avoid unused function warning

pcmv_setup() is only used when the badge4 driver is built-in, but not when it is a loadable module:

drivers/pcmcia/sa1111_badge4.c:153:122: error: 'pcmv_setup' defined but not used [-Werror=unused-function]

This adds an #ifdef to avoid the definition of the unused function in the modular case.

---

 drivers/pcmcia/sa1111_badge4.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/pcmcia/sa1111_badge4.c renamed from drivers/pcmcia/sa1111_badge4.c~pcmcia-badge4-avoid-unused-function-warning +2 -0
diff -puN drivers/pcmcia/sa1111_badge4.c~pcmcia-badge4-avoid-unused-function-warning drivers/pcmcia/sa1111_badge4.c
@@ -144,6 +144,7 @@ int pcmcia_badge4_init(struct sa1111_dev
 				 sa11xx_drv_pcmcia_add_one);
 }
 
+#ifndef MODULE
 static int __init pcmv_setup(char *s)
 {
 	int v[4];
@@ -158,3 +159,4 @@ static int __init pcmv_setup(char *s)
 }
 
 __setup("pcmv=", pcmv_setup);
+#endif

_

Patches currently in -mm which might be from [email protected] are