linux/kernel.h: move DIV_ROUND_DOWN_ULL() macro (604df322) · Commits · 戴 / test

This macro is useful to avoid link error on 32-bit systems. We have the same definition in two drivers, so move it to include/linux/kernel.h While we are here, refactor DIV_ROUND_UP_ULL() by using DIV_ROUND_DOWN_ULL(). Link: http://lkml.kernel.org/r/1500945156-12907-1-git-send-email-yamada.masahiro@socionext.com Signed-off-by:

Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by:

Mark Brown <broonie@kernel.org> Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Brian Norris <computersforpeace@gmail.com> Cc: Richard Weinberger <richard@nod.at> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

drivers/mtd/nand/denali.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -980,9 +980,6 @@ static int denali_erase(struct mtd_info *mtd, int page)
		return irq_status & INTR__ERASE_COMP ? 0 : NAND_STATUS_FAIL;
		}

		#define DIV_ROUND_DOWN_ULL(ll, d) \
		({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; })

		static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr,
		const struct nand_data_interface *conf)
		{

include/linux/kernel.h

+5 −2

Original line number	Diff line number	Diff line
		@@ -78,8 +78,11 @@

		#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
		#define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP
		#define DIV_ROUND_UP_ULL(ll,d) \
		({ unsigned long long _tmp = (ll)+(d)-1; do_div(_tmp, d); _tmp; })

		#define DIV_ROUND_DOWN_ULL(ll, d) \
		({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; })

		#define DIV_ROUND_UP_ULL(ll, d) DIV_ROUND_DOWN_ULL((ll) + (d) - 1, (d))

		#if BITS_PER_LONG == 32
		# define DIV_ROUND_UP_SECTOR_T(ll,d) DIV_ROUND_UP_ULL(ll, d)

sound/soc/codecs/pcm512x.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -30,9 +30,6 @@

		#include "pcm512x.h"

		#define DIV_ROUND_DOWN_ULL(ll, d) \
		({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; })

		#define PCM512x_NUM_SUPPLIES 3
		static const char * const pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = {
		"AVDD",

Admin message