ASoC: pcm512x: Do not redefine DIV_ROUND_CLOSEST_ULL
Subsystems (3)
PATCH 1/1 ASoC: pcm512x: Do not redefine DIV_ROUND_CLOSEST_ULL
From: Fabio Estevam <[email protected]>
DIV_ROUND_CLOSEST_ULL is already defined at <linux/kernel.h>, so use the definition from this header file rather than re-defining it locally.
This fixes the following build warning:
sound/soc/codecs/pcm512x.c:34:0: warning: "DIV_ROUND_CLOSEST_ULL" redefined [enabled by default] In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/pcm512x.c:19:include/linux/kernel.h:110:0: note: this is the location of the previous definition
--- sound/soc/codecs/pcm512x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/codecs/pcm512x.c +1 -2
@@ -18,6 +18,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/clk.h> +#include <linux/kernel.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
@@ -31,8 +32,6 @@#define DIV_ROUND_DOWN_ULL (ll, d) \ ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; }) -#define DIV_ROUND_CLOSEST_ULL (ll, d) \ - ({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; })#define PCM512x_NUM_SUPPLIES 3static const char *const pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = {
Signature · 1 line
1.9.1
Mark Brown
maintainerQuoted 4 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
DIV_ROUND_CLOSEST_ULLis already defined at <linux/kernel.h>, so use the definition from this header file rather than re-defining it locally.
Someone already sent a patch for this, unfortunately the issue exists only in -mm and akpm didn' pick the patch up yet.