[U-Boot] [PATCH 03/13] compat: Remove is_power_of_2() definition

[Heiko Schocher]

Hello Fabian,

Am 24.10.2015 um 14:28 schrieb Fabio Estevam:
> From: Fabio Estevam <fabio.estevam at freescale.com>
>
> Use the is_power_of_2() definition from log2.h to align with the
> kernel implementation.
>
> Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
> ---
>   arch/arm/mach-mvebu/mbus.c | 2 +-
>   drivers/mtd/mtdcore.c      | 2 +-
>   drivers/mtd/ubi/build.c    | 2 +-
>   fs/ubifs/super.c           | 2 +-
>   include/linux/compat.h     | 6 ------
>   5 files changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c
> index 771cce6..346278e 100644
> --- a/arch/arm/mach-mvebu/mbus.c
> +++ b/arch/arm/mach-mvebu/mbus.c
> @@ -52,7 +52,7 @@
>   #include <asm/io.h>
>   #include <asm/arch/cpu.h>
>   #include <asm/arch/soc.h>
> -#include <linux/compat.h>
> +#include <linux/log2.h>
>   #include <linux/mbus.h>
>
>   /* DDR target is the same on all platforms */
> diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
> index 2f2172b..81be0f7 100644
> --- a/drivers/mtd/mtdcore.c
> +++ b/drivers/mtd/mtdcore.c
> @@ -27,8 +27,8 @@
>   #include <linux/gfp.h>
>   #include <linux/slab.h>
>   #else
> -#include <linux/compat.h>
>   #include <linux/err.h>
> +#include <linux/log2.h>
>   #include <ubi_uboot.h>
>   #endif
>
> diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
> index 290d524..6ed7667 100644
> --- a/drivers/mtd/ubi/build.c
> +++ b/drivers/mtd/ubi/build.c
> @@ -30,7 +30,7 @@
>   #include <linux/slab.h>
>   #include <linux/major.h>
>   #else
> -#include <linux/compat.h>
> +#include <linux/log2.h>
>   #endif
>   #include <linux/err.h>
>   #include <ubi_uboot.h>
> diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
> index 41763a1..eaae5fb 100644
> --- a/fs/ubifs/super.c
> +++ b/fs/ubifs/super.c
> @@ -31,7 +31,7 @@
>   #include <common.h>
>   #include <malloc.h>
>   #include <memalign.h>
> -#include <linux/compat.h>
> +#include <linux/log2.h>
>   #include <linux/stat.h>
>   #include <linux/err.h>
>   #include "ubifs.h"

It would be nice to ge rid of linux/compat.h at all in ubi/ubifs
code ... but does this really compile for all boards?

I think you should add here linux/log2.h, without deleting linux/compat.h

bye,
Heiko
> diff --git a/include/linux/compat.h b/include/linux/compat.h
> index fbebf91..7a99599 100644
> --- a/include/linux/compat.h
> +++ b/include/linux/compat.h
> @@ -104,12 +104,6 @@ static inline void led_trigger_unregister_simple(struct led_trigger *trigger) {}
>   static inline void led_trigger_event(struct led_trigger *trigger,
>   					enum led_brightness event) {}
>
> -/* include/linux/log2.h */
> -static inline int is_power_of_2(unsigned long n)
> -{
> -	return (n != 0 && ((n & (n - 1)) == 0));
> -}
> -
>   /* uapi/linux/limits.h */
>   #define XATTR_LIST_MAX 65536	/* size of extended attribute namelist (64k) */
>
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany