mmc: sdhci-cadence: include <linux/bits.h> instead of <linux/bitops.h>

Message ID 1540897506-3075-1-git-send-email-yamada.masahiro@socionext.com
State New
Headers show
Series
  • mmc: sdhci-cadence: include <linux/bits.h> instead of <linux/bitops.h>
Related show

Commit Message

Masahiro Yamada Oct. 30, 2018, 11:05 a.m.
The reason of including <linux/bitops.h> here is just for BIT() and
GENMASK() macros.

Since commit 8bd9cb51daac8 ("locking/atomics, asm-generic: Move some
macros from <linux/bitops.h> to a new <linux/bits.h> file"),
<linux/bits.h> is enough for such compile-time macros.

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

---

 drivers/mmc/host/sdhci-cadence.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.7.4

Comments

Adrian Hunter Oct. 30, 2018, 12:35 p.m. | #1
On 30/10/18 1:05 PM, Masahiro Yamada wrote:
> The reason of including <linux/bitops.h> here is just for BIT() and

> GENMASK() macros.

> 

> Since commit 8bd9cb51daac8 ("locking/atomics, asm-generic: Move some

> macros from <linux/bitops.h> to a new <linux/bits.h> file"),

> <linux/bits.h> is enough for such compile-time macros.

> 

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


Acked-by: Adrian Hunter <adrian.hunter@intel.com>


> ---

> 

>  drivers/mmc/host/sdhci-cadence.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c

> index 7a343b8..e241287 100644

> --- a/drivers/mmc/host/sdhci-cadence.c

> +++ b/drivers/mmc/host/sdhci-cadence.c

> @@ -14,7 +14,7 @@

>   */

>  

>  #include <linux/bitfield.h>

> -#include <linux/bitops.h>

> +#include <linux/bits.h>

>  #include <linux/iopoll.h>

>  #include <linux/module.h>

>  #include <linux/mmc/host.h>

>
Ulf Hansson Nov. 19, 2018, 12:07 p.m. | #2
On 30 October 2018 at 12:05, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> The reason of including <linux/bitops.h> here is just for BIT() and

> GENMASK() macros.

>

> Since commit 8bd9cb51daac8 ("locking/atomics, asm-generic: Move some

> macros from <linux/bitops.h> to a new <linux/bits.h> file"),

> <linux/bits.h> is enough for such compile-time macros.

>

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


Applied for next, thanks!

Kind regards
Uffe

> ---

>

>  drivers/mmc/host/sdhci-cadence.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c

> index 7a343b8..e241287 100644

> --- a/drivers/mmc/host/sdhci-cadence.c

> +++ b/drivers/mmc/host/sdhci-cadence.c

> @@ -14,7 +14,7 @@

>   */

>

>  #include <linux/bitfield.h>

> -#include <linux/bitops.h>

> +#include <linux/bits.h>

>  #include <linux/iopoll.h>

>  #include <linux/module.h>

>  #include <linux/mmc/host.h>

> --

> 2.7.4

>

Patch

diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
index 7a343b8..e241287 100644
--- a/drivers/mmc/host/sdhci-cadence.c
+++ b/drivers/mmc/host/sdhci-cadence.c
@@ -14,7 +14,7 @@ 
  */
 
 #include <linux/bitfield.h>
-#include <linux/bitops.h>
+#include <linux/bits.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
 #include <linux/mmc/host.h>