diff mbox

[U-Boot,v2,03/12] compat: Remove is_power_of_2() definition

Message ID 1445700414-28600-3-git-send-email-festevam@gmail.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Fabio Estevam Oct. 24, 2015, 3:26 p.m. UTC
From: Fabio Estevam <fabio.estevam@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@freescale.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes since v1:
- None

 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(-)

Comments

Jagan Teki Oct. 25, 2015, 6:53 a.m. UTC | #1
Hi Febio,

On 24 October 2015 at 20:56, Fabio Estevam <festevam@gmail.com> wrote:
> From: Fabio Estevam <fabio.estevam@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@freescale.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
> Changes since v1:
> - None
>
>  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>

I think we can place this header in to common.h like bitops.h does,
because even Linux does same as bitops.h include<linux/kernel.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"
> 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) */
>
> --
> 1.9.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
Fabio Estevam Oct. 25, 2015, 1:11 p.m. UTC | #2
On Sun, Oct 25, 2015 at 4:53 AM, Jagan Teki <jteki@openedev.com> wrote:
> Hi Febio,
>
> On 24 October 2015 at 20:56, Fabio Estevam <festevam@gmail.com> wrote:
>> From: Fabio Estevam <fabio.estevam@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@freescale.com>
>> Reviewed-by: Tom Rini <trini@konsulko.com>
>> ---
>> Changes since v1:
>> - None
>>
>>  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>
>
> I think we can place this header in to common.h like bitops.h does,
> because even Linux does same as bitops.h include<linux/kernel.h>

In this case this could be a separate patch then. My intention here
was merely use the is_power_of_2() definition from log2.h instead of
compat.h to align with the kernel implementation.

Feel free to submit your proposal as an incremental patch.

Regards,

Fabio Estevam
diff mbox

Patch

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"
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) */