[PATCH 1/2] include/linux/torture.h: remove unused duplicate definition

[PATCH 1/2] include/linux/torture.h: remove unused duplicate definition

[Pranith Kumar]

remove an unused duplicate definition of torture_param

Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
---
 include/linux/torture.h |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/linux/torture.h b/include/linux/torture.h
index b2e2b46..88a84a2 100644
--- a/include/linux/torture.h
+++ b/include/linux/torture.h
@@ -49,12 +49,6 @@
 #define VERBOSE_TOROUT_ERRSTRING(s) \
 	do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! %s\n", torture_type, s); } while (0)
 
-/* Definitions for a non-string torture-test module parameter. */
-#define torture_parm(type, name, init, msg) \
-	static type name = init; \
-	module_param(name, type, 0444); \
-	MODULE_PARM_DESC(name, msg);
-
 /* Definitions for online/offline exerciser. */
 int torture_onoff_init(long ooholdoff, long oointerval);
 char *torture_onoff_stats(char *page);
-- 
1.7.9.5

Re: [PATCH 1/2] include/linux/torture.h: remove unused duplicate definition

[Paul E. McKenney]

On Wed, Apr 16, 2014 at 04:46:01PM -0400, Pranith Kumar wrote:
> remove an unused duplicate definition of torture_param
> 
> Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>

This one confused me at first because I could only find one torture_param().
I applied the patch anyway, and it built without errors.  I looked more
closely and realized that the names aren't quite the same.  The one you
removed has only one "a" in the name, and the one remaining has two "a"s
in its name.  ;-)

Good eyes!  I updated the title and commit log and queued for 3.16.

							Thanx, Paul

> ---
>  include/linux/torture.h |    6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/include/linux/torture.h b/include/linux/torture.h
> index b2e2b46..88a84a2 100644
> --- a/include/linux/torture.h
> +++ b/include/linux/torture.h
> @@ -49,12 +49,6 @@
>  #define VERBOSE_TOROUT_ERRSTRING(s) \
>  	do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! %s\n", torture_type, s); } while (0)
> 
> -/* Definitions for a non-string torture-test module parameter. */
> -#define torture_parm(type, name, init, msg) \
> -	static type name = init; \
> -	module_param(name, type, 0444); \
> -	MODULE_PARM_DESC(name, msg);
> -
>  /* Definitions for online/offline exerciser. */
>  int torture_onoff_init(long ooholdoff, long oointerval);
>  char *torture_onoff_stats(char *page);
> -- 
> 1.7.9.5
>