Include linux/bitfield.h only in habanalabs.h, instead of in each and
every file that needs it, as habanalabs.h is already included by all.
Signed-off-by: Tomer Tayar <[email protected]>
---
drivers/misc/habanalabs/common/habanalabs.h | 1 +
drivers/misc/habanalabs/common/hw_queue.c | 1 -
drivers/misc/habanalabs/common/pci.c | 1 -
drivers/misc/habanalabs/gaudi/gaudi.c | 1 -
drivers/misc/habanalabs/include/gaudi/gaudi_masks.h | 1 -
5 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
index dbf214421ae1..0a422fd742e9 100644
--- a/drivers/misc/habanalabs/common/habanalabs.h
+++ b/drivers/misc/habanalabs/common/habanalabs.h
@@ -18,6 +18,7 @@
#include <linux/dma-direction.h>
#include <linux/scatterlist.h>
#include <linux/hashtable.h>
+#include <linux/bitfield.h>
#define HL_NAME "habanalabs"
diff --git a/drivers/misc/habanalabs/common/hw_queue.c b/drivers/misc/habanalabs/common/hw_queue.c
index e2f9ba04b32d..5e66c98fb0d3 100644
--- a/drivers/misc/habanalabs/common/hw_queue.c
+++ b/drivers/misc/habanalabs/common/hw_queue.c
@@ -8,7 +8,6 @@
#include "habanalabs.h"
#include <linux/slab.h>
-#include <linux/bitfield.h>
/*
* hl_queue_add_ptr - add to pi or ci and checks if it wraps around
diff --git a/drivers/misc/habanalabs/common/pci.c b/drivers/misc/habanalabs/common/pci.c
index 7bd3737571f3..b054ed6c2141 100644
--- a/drivers/misc/habanalabs/common/pci.c
+++ b/drivers/misc/habanalabs/common/pci.c
@@ -9,7 +9,6 @@
#include "../include/hw_ip/pci/pci_general.h"
#include <linux/pci.h>
-#include <linux/bitfield.h>
#define HL_PLDM_PCI_ELBI_TIMEOUT_MSEC (HL_PCI_ELBI_TIMEOUT_MSEC * 10)
diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
index e56f95e6c741..cbd8acceddbf 100644
--- a/drivers/misc/habanalabs/gaudi/gaudi.c
+++ b/drivers/misc/habanalabs/gaudi/gaudi.c
@@ -21,7 +21,6 @@
#include <linux/io-64-nonatomic-lo-hi.h>
#include <linux/iommu.h>
#include <linux/seq_file.h>
-#include <linux/bitfield.h>
/*
* Gaudi security scheme:
diff --git a/drivers/misc/habanalabs/include/gaudi/gaudi_masks.h b/drivers/misc/habanalabs/include/gaudi/gaudi_masks.h
index 3d4f9aed41f1..504f3ad711b5 100644
--- a/drivers/misc/habanalabs/include/gaudi/gaudi_masks.h
+++ b/drivers/misc/habanalabs/include/gaudi/gaudi_masks.h
@@ -9,7 +9,6 @@
#define GAUDI_MASKS_H_
#include "asic_reg/gaudi_regs.h"
-#include <linux/bitfield.h>
/* Useful masks for bits in various registers */
#define PCI_DMA_QMAN_ENABLE (\
--
2.17.1
On Tue, Aug 18, 2020 at 3:07 PM Tomer Tayar <[email protected]> wrote:
>
> Include linux/bitfield.h only in habanalabs.h, instead of in each and
> every file that needs it, as habanalabs.h is already included by all.
>
> Signed-off-by: Tomer Tayar <[email protected]>
> ---
> drivers/misc/habanalabs/common/habanalabs.h | 1 +
> drivers/misc/habanalabs/common/hw_queue.c | 1 -
> drivers/misc/habanalabs/common/pci.c | 1 -
> drivers/misc/habanalabs/gaudi/gaudi.c | 1 -
> drivers/misc/habanalabs/include/gaudi/gaudi_masks.h | 1 -
> 5 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
> index dbf214421ae1..0a422fd742e9 100644
> --- a/drivers/misc/habanalabs/common/habanalabs.h
> +++ b/drivers/misc/habanalabs/common/habanalabs.h
> @@ -18,6 +18,7 @@
> #include <linux/dma-direction.h>
> #include <linux/scatterlist.h>
> #include <linux/hashtable.h>
> +#include <linux/bitfield.h>
>
> #define HL_NAME "habanalabs"
>
> diff --git a/drivers/misc/habanalabs/common/hw_queue.c b/drivers/misc/habanalabs/common/hw_queue.c
> index e2f9ba04b32d..5e66c98fb0d3 100644
> --- a/drivers/misc/habanalabs/common/hw_queue.c
> +++ b/drivers/misc/habanalabs/common/hw_queue.c
> @@ -8,7 +8,6 @@
> #include "habanalabs.h"
>
> #include <linux/slab.h>
> -#include <linux/bitfield.h>
>
> /*
> * hl_queue_add_ptr - add to pi or ci and checks if it wraps around
> diff --git a/drivers/misc/habanalabs/common/pci.c b/drivers/misc/habanalabs/common/pci.c
> index 7bd3737571f3..b054ed6c2141 100644
> --- a/drivers/misc/habanalabs/common/pci.c
> +++ b/drivers/misc/habanalabs/common/pci.c
> @@ -9,7 +9,6 @@
> #include "../include/hw_ip/pci/pci_general.h"
>
> #include <linux/pci.h>
> -#include <linux/bitfield.h>
>
> #define HL_PLDM_PCI_ELBI_TIMEOUT_MSEC (HL_PCI_ELBI_TIMEOUT_MSEC * 10)
>
> diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
> index e56f95e6c741..cbd8acceddbf 100644
> --- a/drivers/misc/habanalabs/gaudi/gaudi.c
> +++ b/drivers/misc/habanalabs/gaudi/gaudi.c
> @@ -21,7 +21,6 @@
> #include <linux/io-64-nonatomic-lo-hi.h>
> #include <linux/iommu.h>
> #include <linux/seq_file.h>
> -#include <linux/bitfield.h>
>
> /*
> * Gaudi security scheme:
> diff --git a/drivers/misc/habanalabs/include/gaudi/gaudi_masks.h b/drivers/misc/habanalabs/include/gaudi/gaudi_masks.h
> index 3d4f9aed41f1..504f3ad711b5 100644
> --- a/drivers/misc/habanalabs/include/gaudi/gaudi_masks.h
> +++ b/drivers/misc/habanalabs/include/gaudi/gaudi_masks.h
> @@ -9,7 +9,6 @@
> #define GAUDI_MASKS_H_
>
> #include "asic_reg/gaudi_regs.h"
> -#include <linux/bitfield.h>
>
> /* Useful masks for bits in various registers */
> #define PCI_DMA_QMAN_ENABLE (\
> --
> 2.17.1
>
This patch is:
Reviewed-by: Oded Gabbay <[email protected]>