Skip to contentSkip to conversation

Staging: comedi: comedidev: Removed unused macro definitions

PATCH In review Michael Jensen 4 participants 6 messages Jul 25, 2010 – Jul 27, 2010 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: comedi: comedidev: Removed unused macro definitions

Removed macro definition that wasn't used.

---
 drivers/staging/comedi/comedidev.h |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
drivers/staging/comedi/comedidev.h +0 -5
index 4eb2b77..b225fff 100644
@@ -61,11 +61,6 @@
 	module_init(x ## _init_module);					\
 	module_exit(x ## _cleanup_module);
 
-#define COMEDI_MODULE_MACROS						\
-	MODULE_AUTHOR("Comedi http://www.comedi.org");		\
-	MODULE_DESCRIPTION("Comedi low-level driver");			\
-	MODULE_LICENSE("GPL");
-
 #define COMEDI_INITCLEANUP(x)						\
 	COMEDI_MODULE_MACROS		\
 	COMEDI_INITCLEANUP_NOMODULE(x)
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 12 lines · Michael Jensen

Removed macro definition that wasn't used.

---
 drivers/staging/comedi/comedidev.h |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
drivers/staging/comedi/comedidev.h +0 -0
index 4eb2b77..b225fff 100644

drivers/staging/comedi/comedidev.h line 65

Quoted 10 lines
drivers/staging/comedi/comedidev.h +0 -5
@@ -61,11 +61,6 @@
 	module_init(x ## _init_module);					\
 	module_exit(x ## _cleanup_module);
 
-#define COMEDI_MODULE_MACROS						\
-	MODULE_AUTHOR("Comedi http://www.comedi.org");		\
-	MODULE_DESCRIPTION("Comedi low-level driver");			\
-	MODULE_LICENSE("GPL");
-
 #define COMEDI_INITCLEANUP(x)						\
 	COMEDI_MODULE_MACROS		\

As you are removing COMEDI_MODULE_MACROS, it makes sense to remove COMEDI_INITCLEANUP too.

Quoted 1 line
drivers/staging/comedi/comedidev.h +0 -0
 	COMEDI_INITCLEANUP_NOMODULE(x)
Signature · 1 line
js
#2 lore raw
Quoted 9 lines

As you are removing COMEDI_MODULE_MACROS, it makes sense to remove COMEDI_INITCLEANUP too.

Quoted 1 line

      COMEDI_INITCLEANUP_NOMODULE(x)

--
js

Disregard this patch, comedi drivers are still using this macro, via COMEDI_INITCLEANUP (compile fails at comedi/drivers/8255.c)

Signature · 3 lines
Regards,

Michael Jensen
#3 lore raw
In reply to Michael Jensen
Quoted 12 lines · Michael Jensen

Removed macro definition that wasn't used.

---
 drivers/staging/comedi/comedidev.h |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
drivers/staging/comedi/comedidev.h +0 -0
index 4eb2b77..b225fff 100644

drivers/staging/comedi/comedidev.h line 64

Quoted 4 lines
drivers/staging/comedi/comedidev.h +0 -1
@@ -61,11 +61,6 @@
 	module_init(x ## _init_module);					\
 	module_exit(x ## _cleanup_module);
 
-#define COMEDI_MODULE_MACROS						\

This doesn't apply against the linux-next tree as this macro is already gone from there.

What tree are you creating this diff against?

confused,

greg k-h

#4 lore raw
Quoted 10 lines · Greg KH

This doesn't apply against the linux-next tree as this macro is already gone from there.

What tree are you creating this diff against?

confused,

greg k-h

The main tree, cloned from
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signature · 3 lines
Regards,

Michael Jensen
#5 lore raw
Quoted 7 lines · Michael Jensen
Quoted 6 lines · Greg KH

This doesn't apply against the linux-next tree as this macro is already gone from there.

What tree are you creating this diff against?

Quoted 7 lines
Quoted 4 lines

confused,

greg k-h

The main tree, cloned from
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Yeah, that's not going to work for any development.

Try the linux-next tree instead, that is where everything is queuing up. Again, this macro is already gone in the linux-next tree which is what will be merged with Linus's tree for the next release (2.6.36).

Hope this helps,

greg k-h