* [PATCH] Staging: comedi: comedidev: Removed unused macro definitions
@ 2010-07-25 15:14 Michael Jensen
2010-07-25 15:27 ` Jiri Slaby
2010-07-26 22:43 ` Greg KH
0 siblings, 2 replies; 6+ messages in thread
From: Michael Jensen @ 2010-07-25 15:14 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Jensen
Removed macro definition that wasn't used.
Signed-off-by: Michael Jensen <emjay1988@gmail.com>
---
drivers/staging/comedi/comedidev.h | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 4eb2b77..b225fff 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -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)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] Staging: comedi: comedidev: Removed unused macro definitions
2010-07-25 15:14 [PATCH] Staging: comedi: comedidev: Removed unused macro definitions Michael Jensen
@ 2010-07-25 15:27 ` Jiri Slaby
2010-07-26 1:11 ` Michael Jensen
2010-07-26 22:43 ` Greg KH
1 sibling, 1 reply; 6+ messages in thread
From: Jiri Slaby @ 2010-07-25 15:27 UTC (permalink / raw)
To: Michael Jensen; +Cc: gregkh, devel, linux-kernel
On 07/25/2010 05:14 PM, Michael Jensen wrote:
> Removed macro definition that wasn't used.
>
> Signed-off-by: Michael Jensen <emjay1988@gmail.com>
> ---
> drivers/staging/comedi/comedidev.h | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
> index 4eb2b77..b225fff 100644
> --- a/drivers/staging/comedi/comedidev.h
> +++ b/drivers/staging/comedi/comedidev.h
> @@ -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.
> COMEDI_INITCLEANUP_NOMODULE(x)
--
js
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Staging: comedi: comedidev: Removed unused macro definitions
2010-07-25 15:27 ` Jiri Slaby
@ 2010-07-26 1:11 ` Michael Jensen
0 siblings, 0 replies; 6+ messages in thread
From: Michael Jensen @ 2010-07-26 1:11 UTC (permalink / raw)
To: Jiri Slaby; +Cc: gregkh, devel, linux-kernel
> As you are removing COMEDI_MODULE_MACROS, it makes sense to remove
> COMEDI_INITCLEANUP too.
>
>> 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)
--
Regards,
Michael Jensen
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Staging: comedi: comedidev: Removed unused macro definitions
2010-07-25 15:14 [PATCH] Staging: comedi: comedidev: Removed unused macro definitions Michael Jensen
2010-07-25 15:27 ` Jiri Slaby
@ 2010-07-26 22:43 ` Greg KH
2010-07-26 23:46 ` Michael Jensen
1 sibling, 1 reply; 6+ messages in thread
From: Greg KH @ 2010-07-26 22:43 UTC (permalink / raw)
To: Michael Jensen; +Cc: gregkh, devel, linux-kernel
On Mon, Jul 26, 2010 at 01:14:34AM +1000, Michael Jensen wrote:
> Removed macro definition that wasn't used.
>
> Signed-off-by: Michael Jensen <emjay1988@gmail.com>
> ---
> drivers/staging/comedi/comedidev.h | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
> index 4eb2b77..b225fff 100644
> --- a/drivers/staging/comedi/comedidev.h
> +++ b/drivers/staging/comedi/comedidev.h
> @@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Staging: comedi: comedidev: Removed unused macro definitions
2010-07-26 22:43 ` Greg KH
@ 2010-07-26 23:46 ` Michael Jensen
2010-07-27 0:01 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Michael Jensen @ 2010-07-26 23:46 UTC (permalink / raw)
To: Greg KH; +Cc: gregkh, devel, linux-kernel
On Tue, Jul 27, 2010 at 8:43 AM, Greg KH <greg@kroah.com> wrote:
>
> 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
--
Regards,
Michael Jensen
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Staging: comedi: comedidev: Removed unused macro definitions
2010-07-26 23:46 ` Michael Jensen
@ 2010-07-27 0:01 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2010-07-27 0:01 UTC (permalink / raw)
To: Michael Jensen; +Cc: Greg KH, devel, linux-kernel
On Tue, Jul 27, 2010 at 09:46:00AM +1000, Michael Jensen wrote:
> On Tue, Jul 27, 2010 at 8:43 AM, Greg KH <greg@kroah.com> wrote:
> >
> > 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
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-07-27 0:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-25 15:14 [PATCH] Staging: comedi: comedidev: Removed unused macro definitions Michael Jensen
2010-07-25 15:27 ` Jiri Slaby
2010-07-26 1:11 ` Michael Jensen
2010-07-26 22:43 ` Greg KH
2010-07-26 23:46 ` Michael Jensen
2010-07-27 0:01 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox