Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 639938eb606e94af498c589feae2f0b8a5c285d1

Authored by Paul Gortmaker
1 parent f50169324d
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

module.h: relocate MODULE_PARM_DESC into moduleparam.h 

There are files which use module_param and MODULE_PARM_DESC
back to back.  They only include moduleparam.h which makes sense,
but the implicit presence of module.h everywhere hid the fact
that MODULE_PARM_DESC wasn't in moduleparam.h at all.  Relocate
the macro to moduleparam.h so that the moduleparam infrastructure
can be used independently of module.h

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Showing 2 changed files with 5 additions and 5 deletions Side-by-side Diff

include/linux/module.h
Diff comments   View file @ 639938e
... ... @@ -135,11 +135,6 @@
135 135 /* What your module does. */
136 136 #define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)
137 137  
138   -/* One for each parameter, describing how to use it. Some files do
139   - multiple of these per line, so can't just use MODULE_INFO. */
140   -#define MODULE_PARM_DESC(_parm, desc) \
141   - __MODULE_INFO(parm, _parm, #_parm ":" desc)
142   -
143 138 #define MODULE_DEVICE_TABLE(type,name) \
144 139 MODULE_GENERIC_TABLE(type##_device,name)
145 140  
include/linux/moduleparam.h
Diff comments   View file @ 639938e
... ... @@ -31,6 +31,11 @@
31 31 #define __MODULE_PARM_TYPE(name, _type) \
32 32 __MODULE_INFO(parmtype, name##type, #name ":" _type)
33 33  
  34 +/* One for each parameter, describing how to use it. Some files do
  35 + multiple of these per line, so can't just use MODULE_INFO. */
  36 +#define MODULE_PARM_DESC(_parm, desc) \
  37 + __MODULE_INFO(parm, _parm, #_parm ":" desc)
  38 +
34 39 struct kernel_param;
35 40  
36 41 struct kernel_param_ops {