Replace macro function by static inline function.
Issue suggested by Julia.
Signed-off-by: Aline Santana Cordeiro <[email protected]>
---
drivers/staging/media/omap4iss/iss_ipipe.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c b/drivers/staging/media/omap4iss/iss_ipipe.c
index 26be078..09c941c 100644
--- a/drivers/staging/media/omap4iss/iss_ipipe.c
+++ b/drivers/staging/media/omap4iss/iss_ipipe.c
@@ -38,9 +38,11 @@ static const unsigned int ipipe_fmts[] = {
*
* Also prints other debug information stored in the IPIPE module.
*/
-#define IPIPE_PRINT_REGISTER(iss, name)\
- dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n", \
- iss_reg_read(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_##name))
+static inline ipipe_print_register(iss, name)
+{
+ dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
+ iss_reg_read(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_##name));
+}
static void ipipe_print_status(struct iss_ipipe_device *ipipe)
{
@@ -48,16 +50,16 @@ static void ipipe_print_status(struct iss_ipipe_device *ipipe)
dev_dbg(iss->dev, "-------------IPIPE Register dump-------------\n");
- IPIPE_PRINT_REGISTER(iss, SRC_EN);
- IPIPE_PRINT_REGISTER(iss, SRC_MODE);
- IPIPE_PRINT_REGISTER(iss, SRC_FMT);
- IPIPE_PRINT_REGISTER(iss, SRC_COL);
- IPIPE_PRINT_REGISTER(iss, SRC_VPS);
- IPIPE_PRINT_REGISTER(iss, SRC_VSZ);
- IPIPE_PRINT_REGISTER(iss, SRC_HPS);
- IPIPE_PRINT_REGISTER(iss, SRC_HSZ);
- IPIPE_PRINT_REGISTER(iss, GCK_MMR);
- IPIPE_PRINT_REGISTER(iss, YUV_PHS);
+ ipipe_print_register(iss, SRC_EN);
+ ipipe_print_register(iss, SRC_MODE);
+ ipipe_print_register(iss, SRC_FMT);
+ ipipe_print_register(iss, SRC_COL);
+ ipipe_print_register(iss, SRC_VPS);
+ ipipe_print_register(iss, SRC_VSZ);
+ ipipe_print_register(iss, SRC_HPS);
+ ipipe_print_register(iss, SRC_HSZ);
+ ipipe_print_register(iss, GCK_MMR);
+ ipipe_print_register(iss, YUV_PHS);
dev_dbg(iss->dev, "-----------------------------------------------\n");
}
--
2.7.4
Hi Aline,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linuxtv-media/master]
[also build test WARNING on v5.12-rc7 next-20210412]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Aline-Santana-Cordeiro/Replace-macro-function-by-static-inline-function-in-file-iss-c/20210412-213252
base: git://linuxtv.org/media_tree.git master
config: arc-allyesconfig (attached as .config)
compiler: arceb-elf-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/be8ef400d02afa928839bd6264ba2100ac02986d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Aline-Santana-Cordeiro/Replace-macro-function-by-static-inline-function-in-file-iss-c/20210412-213252
git checkout be8ef400d02afa928839bd6264ba2100ac02986d
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arc
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
drivers/staging/media/omap4iss/iss_ipipe.c:41:15: error: return type defaults to 'int' [-Werror=return-type]
41 | static inline ipipe_print_register(iss, name)
| ^~~~~~~~~~~~~~~~~~~~
drivers/staging/media/omap4iss/iss_ipipe.c:41:15: error: function declaration isn't a prototype [-Werror=strict-prototypes]
drivers/staging/media/omap4iss/iss_ipipe.c: In function 'ipipe_print_register':
>> drivers/staging/media/omap4iss/iss_ipipe.c:41:15: warning: old-style function definition [-Wold-style-definition]
>> drivers/staging/media/omap4iss/iss_ipipe.c:41:15: warning: type of 'iss' defaults to 'int' [-Wmissing-parameter-type]
>> drivers/staging/media/omap4iss/iss_ipipe.c:41:15: warning: type of 'name' defaults to 'int' [-Wmissing-parameter-type]
In file included from include/linux/printk.h:409,
from include/linux/kernel.h:16,
from include/linux/list.h:9,
from include/linux/module.h:12,
from drivers/staging/media/omap4iss/iss_ipipe.c:10:
drivers/staging/media/omap4iss/iss_ipipe.c:43:32: error: stray '#' in program
43 | dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
| ^
include/linux/dynamic_debug.h:91:14: note: in definition of macro 'DEFINE_DYNAMIC_DEBUG_METADATA'
91 | .format = (fmt), \
| ^~~
include/linux/dynamic_debug.h:147:2: note: in expansion of macro '__dynamic_func_call'
147 | __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__)
| ^~~~~~~~~~~~~~~~~~~
include/linux/dynamic_debug.h:161:2: note: in expansion of macro '_dynamic_func_call'
161 | _dynamic_func_call(fmt,__dynamic_dev_dbg, \
| ^~~~~~~~~~~~~~~~~~
include/linux/dev_printk.h:123:2: note: in expansion of macro 'dynamic_dev_dbg'
123 | dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~~~~~~~~~
include/linux/dev_printk.h:123:23: note: in expansion of macro 'dev_fmt'
123 | dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~
drivers/staging/media/omap4iss/iss_ipipe.c:43:2: note: in expansion of macro 'dev_dbg'
43 | dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
| ^~~~~~~
drivers/staging/media/omap4iss/iss_ipipe.c:43:33: error: expected ')' before 'name'
43 | dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
| ^~~~
include/linux/dynamic_debug.h:91:14: note: in definition of macro 'DEFINE_DYNAMIC_DEBUG_METADATA'
91 | .format = (fmt), \
| ^~~
include/linux/dynamic_debug.h:147:2: note: in expansion of macro '__dynamic_func_call'
147 | __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__)
| ^~~~~~~~~~~~~~~~~~~
include/linux/dynamic_debug.h:161:2: note: in expansion of macro '_dynamic_func_call'
161 | _dynamic_func_call(fmt,__dynamic_dev_dbg, \
| ^~~~~~~~~~~~~~~~~~
include/linux/dev_printk.h:123:2: note: in expansion of macro 'dynamic_dev_dbg'
123 | dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~~~~~~~~~
include/linux/dev_printk.h:123:23: note: in expansion of macro 'dev_fmt'
123 | dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~
drivers/staging/media/omap4iss/iss_ipipe.c:43:2: note: in expansion of macro 'dev_dbg'
43 | dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
| ^~~~~~~
include/linux/dynamic_debug.h:91:13: note: to match this '('
91 | .format = (fmt), \
| ^
include/linux/dynamic_debug.h:127:2: note: in expansion of macro 'DEFINE_DYNAMIC_DEBUG_METADATA'
127 | DEFINE_DYNAMIC_DEBUG_METADATA(id, fmt); \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/dynamic_debug.h:147:2: note: in expansion of macro '__dynamic_func_call'
147 | __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__)
| ^~~~~~~~~~~~~~~~~~~
include/linux/dynamic_debug.h:161:2: note: in expansion of macro '_dynamic_func_call'
161 | _dynamic_func_call(fmt,__dynamic_dev_dbg, \
| ^~~~~~~~~~~~~~~~~~
include/linux/dev_printk.h:123:2: note: in expansion of macro 'dynamic_dev_dbg'
123 | dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~~~~~~~~~
drivers/staging/media/omap4iss/iss_ipipe.c:43:2: note: in expansion of macro 'dev_dbg'
43 | dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
| ^~~~~~~
drivers/staging/media/omap4iss/iss_ipipe.c:43:13: error: invalid type argument of '->' (have 'int')
43 | dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
| ^~
include/linux/dynamic_debug.h:129:15: note: in definition of macro '__dynamic_func_call'
129 | func(&id, ##__VA_ARGS__); \
| ^~~~~~~~~~~
include/linux/dynamic_debug.h:161:2: note: in expansion of macro '_dynamic_func_call'
161 | _dynamic_func_call(fmt,__dynamic_dev_dbg, \
| ^~~~~~~~~~~~~~~~~~
include/linux/dev_printk.h:123:2: note: in expansion of macro 'dynamic_dev_dbg'
123 | dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~~~~~~~~~
drivers/staging/media/omap4iss/iss_ipipe.c:43:2: note: in expansion of macro 'dev_dbg'
43 | dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
| ^~~~~~~
drivers/staging/media/omap4iss/iss_ipipe.c:43:32: error: stray '#' in program
43 | dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
| ^
include/linux/dynamic_debug.h:129:15: note: in definition of macro '__dynamic_func_call'
129 | func(&id, ##__VA_ARGS__); \
| ^~~~~~~~~~~
include/linux/dynamic_debug.h:161:2: note: in expansion of macro '_dynamic_func_call'
161 | _dynamic_func_call(fmt,__dynamic_dev_dbg, \
| ^~~~~~~~~~~~~~~~~~
include/linux/dev_printk.h:123:2: note: in expansion of macro 'dynamic_dev_dbg'
123 | dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~~~~~~~~~
include/linux/dev_printk.h:123:23: note: in expansion of macro 'dev_fmt'
123 | dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~
drivers/staging/media/omap4iss/iss_ipipe.c:43:2: note: in expansion of macro 'dev_dbg'
43 | dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
| ^~~~~~~
drivers/staging/media/omap4iss/iss_ipipe.c:43:33: error: expected ')' before 'name'
43 | dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
vim +41 drivers/staging/media/omap4iss/iss_ipipe.c
34
35 /*
36 * ipipe_print_status - Print current IPIPE Module register values.
37 * @ipipe: Pointer to ISS ISP IPIPE device.
38 *
39 * Also prints other debug information stored in the IPIPE module.
40 */
> 41 static inline ipipe_print_register(iss, name)
42 {
43 dev_dbg(iss->dev, "###IPIPE " #name "=0x%08x\n",
44 iss_reg_read(iss, OMAP4_ISS_MEM_ISP_IPIPE, IPIPE_##name));
45 }
46
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]