diff options
author | Javi Merino <javi.merino@arm.com> | 2015-04-16 15:43:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 09:03:56 -0400 |
commit | d48502eacd8934b79c3e62f7858c79fa6422398b (patch) | |
tree | 28920aae240d8ade11341e40418a44bdff5b61fa /sound | |
parent | 512eb720c9892261d68f86ba880a55cdbb74710d (diff) |
ASoC: pcm512x: use DIV_ROUND_CLOSEST_ULL() from kernel.h
Now that the kernel provides DIV_ROUND_CLOSEST_ULL(), drop the internal
implementation and use the kernel one.
Signed-off-by: Javi Merino <javi.merino@arm.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Peter Rosin <peda@axentia.se>
Acked-by: Mark Brown <broonie@kernel.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/pcm512x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 5a30fdd0da00..e12764d15431 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
20 | #include <linux/clk.h> | 20 | #include <linux/clk.h> |
21 | #include <linux/kernel.h> | ||
21 | #include <linux/pm_runtime.h> | 22 | #include <linux/pm_runtime.h> |
22 | #include <linux/regmap.h> | 23 | #include <linux/regmap.h> |
23 | #include <linux/regulator/consumer.h> | 24 | #include <linux/regulator/consumer.h> |
@@ -31,8 +32,6 @@ | |||
31 | 32 | ||
32 | #define DIV_ROUND_DOWN_ULL(ll, d) \ | 33 | #define DIV_ROUND_DOWN_ULL(ll, d) \ |
33 | ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; }) | 34 | ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; }) |
34 | #define DIV_ROUND_CLOSEST_ULL(ll, d) \ | ||
35 | ({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) | ||
36 | 35 | ||
37 | #define PCM512x_NUM_SUPPLIES 3 | 36 | #define PCM512x_NUM_SUPPLIES 3 |
38 | static const char * const pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = { | 37 | static const char * const pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = { |