2007-08-24 10:24:20

by Robert P. J. Day

[permalink] [raw]
Subject: [PATCH] Remove superfluous definition of __setup_null_param() macro.


Signed-off-by: Robert P. J. Day <[email protected]>

---

since i apparently removed the final remaining reference to this
macro in commit f4895925976977aaeda26ee2a603a99f17db500b (thanks,
adrian), there seems to be little value in keeping this definition
around.

$ grep -rw __setup_null_param *
include/linux/init.h:#define __setup_null_param(str, unique_id) \
include/linux/init.h:#define __setup_null_param(str, unique_id) /* nothing */
$


diff --git a/include/linux/init.h b/include/linux/init.h
index 74b1f43..2e4d3e0 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -165,9 +165,6 @@ struct obs_kernel_param {
__attribute__((aligned((sizeof(long))))) \
= { __setup_str_##unique_id, fn, early }

-#define __setup_null_param(str, unique_id) \
- __setup_param(str, unique_id, NULL, 0)
-
#define __setup(str, fn) \
__setup_param(str, fn, fn, 0)

@@ -234,7 +231,6 @@ void __init parse_early_param(void);
void cleanup_module(void) __attribute__((alias(#exitfn)));

#define __setup_param(str, unique_id, fn) /* nothing */
-#define __setup_null_param(str, unique_id) /* nothing */
#define __setup(str, func) /* nothing */
#endif



--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://crashcourse.ca
========================================================================


2007-08-24 15:25:39

by Satyam Sharma

[permalink] [raw]
Subject: Re: [PATCH] Remove superfluous definition of __setup_null_param() macro.



On Fri, 24 Aug 2007, Robert P. J. Day wrote:
>
> Signed-off-by: Robert P. J. Day <[email protected]>
>
> ---
>
> since i apparently removed the final remaining reference to this
> macro in commit f4895925976977aaeda26ee2a603a99f17db500b (thanks,
> adrian), there seems to be little value in keeping this definition
> around.

How about ...


[PATCH] Remove superfluous definition of __setup_null_param() macro and broken (for MODULE) __setup_param()

From: Robert P. J. Day <[email protected]>

Remove superfluous definition of __setup_null_param() macro, as nobody
uses it anymore.

Also kill the #ifdef-MODULE-case (empty) definition for __setup_param.
It is only required for the !MODULE case, as __setup() is empty for
the MODULE case already. Also, no user outside init.h must use
__setup_null_param directly anyway (and nobody does), so it's not
something whose empty definition we necessarily need to make available
to rest of the kernel. Moreover, this MODULE case of __setup_param has
been broken for more than two years now -- as far back as git history
takes us. Let's get rid of it.

Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Satyam Sharma <[email protected]>

---

include/linux/init.h | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/include/linux/init.h b/include/linux/init.h
index 74b1f43..93b2ca5 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -165,9 +165,6 @@ struct obs_kernel_param {
__attribute__((aligned((sizeof(long))))) \
= { __setup_str_##unique_id, fn, early }

-#define __setup_null_param(str, unique_id) \
- __setup_param(str, unique_id, NULL, 0)
-
#define __setup(str, fn) \
__setup_param(str, fn, fn, 0)

@@ -233,8 +230,6 @@ void __init parse_early_param(void);
{ return exitfn; } \
void cleanup_module(void) __attribute__((alias(#exitfn)));

-#define __setup_param(str, unique_id, fn) /* nothing */
-#define __setup_null_param(str, unique_id) /* nothing */
#define __setup(str, func) /* nothing */
#endif

2007-08-24 15:42:52

by Robert P. J. Day

[permalink] [raw]
Subject: Re: [PATCH] Remove superfluous definition of __setup_null_param() macro.

On Fri, 24 Aug 2007, Satyam Sharma wrote:

>
>
> On Fri, 24 Aug 2007, Robert P. J. Day wrote:
> >
> > Signed-off-by: Robert P. J. Day <[email protected]>
> >
> > ---
> >
> > since i apparently removed the final remaining reference to this
> > macro in commit f4895925976977aaeda26ee2a603a99f17db500b (thanks,
> > adrian), there seems to be little value in keeping this definition
> > around.
>
> How about ...
>
>
> [PATCH] Remove superfluous definition of __setup_null_param() macro and broken (for MODULE) __setup_param()

sure. if no one has any objections, i have no problem with that.

rday
--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://crashcourse.ca
========================================================================