Use the standard method to declare a bitmap array.
Joe Perches (12):
ARM: mach-imx: iomux-imx31: Use DECLARE_BITMAP
dmaengine: rcar-dmac: Use DECLARE_BITMAP
drm/amdkfd: Use DECLARE_BITMAP
drm/radeon: Use DECLARE_BITMAP
IB/ehca: Use DECLARE_BITMAP
bcache: Use DECLARE_BITMAP
spider_net: Use DECLARE_BITMAP
s390/sclp: Use DECLARE_BITMAP
[SCSI] qla4xxx: Use DECLARE_BITMAP
scsi: Use DECLARE_BITMAP
logfs: Use DECLARE_BITMAP
sunrpc: Use DECLARE_BITMAP
arch/arm/mach-imx/iomux-imx31.c | 2 +-
drivers/dma/sh/rcar-dmac.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 ++---
drivers/gpu/drm/radeon/radeon.h | 2 +-
drivers/infiniband/hw/ehca/ipz_pt_fn.h | 2 +-
drivers/md/bcache/journal.c | 2 +-
drivers/net/ethernet/toshiba/spider_net.c | 3 +--
drivers/s390/char/sclp_cmd.c | 2 +-
drivers/scsi/qla4xxx/ql4_def.h | 2 +-
drivers/scsi/sr.c | 2 +-
fs/logfs/logfs.h | 2 +-
net/sunrpc/auth_gss/svcauth_gss.c | 2 +-
12 files changed, 13 insertions(+), 15 deletions(-)
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
Signed-off-by: Joe Perches <[email protected]>
---
arch/arm/mach-imx/iomux-imx31.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/iomux-imx31.c b/arch/arm/mach-imx/iomux-imx31.c
index d6a3075..6dd22ca 100644
--- a/arch/arm/mach-imx/iomux-imx31.c
+++ b/arch/arm/mach-imx/iomux-imx31.c
@@ -40,7 +40,7 @@ static DEFINE_SPINLOCK(gpio_mux_lock);
#define IOMUX_REG_MASK (IOMUX_PADNUM_MASK & ~0x3)
-static unsigned long mxc_pin_alloc_map[NB_PORTS * 32 / BITS_PER_LONG];
+static DECLARE_BITMAP(mxc_pin_alloc_map, NB_PORTS * 32);
/*
* set the mode for a IOMUX pin.
*/
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/dma/sh/rcar-dmac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
index a18d16c..d5423a6 100644
--- a/drivers/dma/sh/rcar-dmac.c
+++ b/drivers/dma/sh/rcar-dmac.c
@@ -183,7 +183,7 @@ struct rcar_dmac {
unsigned int n_channels;
struct rcar_dmac_chan *channels;
- unsigned long modules[256 / BITS_PER_LONG];
+ DECLARE_BITMAP(modules, 256);
};
#define to_rcar_dmac(d) container_of(d, struct rcar_dmac, engine)
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
It seems that "struct kfd_process.allocated_queue_bitmap" is unused.
Maybe it could be deleted instead.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index f21fcce..aba3e5d 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -150,8 +150,7 @@ struct kfd_dev {
const struct kfd2kgd_calls *kfd2kgd;
struct mutex doorbell_mutex;
- unsigned long doorbell_available_index[DIV_ROUND_UP(
- KFD_MAX_NUM_OF_QUEUES_PER_PROCESS, BITS_PER_LONG)];
+ DECLARE_BITMAP(doorbell_available_index, KFD_MAX_NUM_OF_QUEUES_PER_PROCESS);
void *gtt_mem;
uint64_t gtt_start_gpu_addr;
@@ -473,7 +472,7 @@ struct kfd_process {
/* Size is queue_array_size, up to MAX_PROCESS_QUEUES. */
struct kfd_queue **queues;
- unsigned long allocated_queue_bitmap[DIV_ROUND_UP(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS, BITS_PER_LONG)];
+ DECLARE_BITMAP(allocated_queue_bitmap, KFD_MAX_NUM_OF_QUEUES_PER_PROCESS);
/*Is the user space process 32 bit?*/
bool is_32bit_user_mode;
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/gpu/drm/radeon/radeon.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 46eb0fa..d556733 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -719,7 +719,7 @@ struct radeon_doorbell {
resource_size_t size;
u32 __iomem *ptr;
u32 num_doorbells; /* Number of doorbells actually reserved for radeon. */
- unsigned long used[DIV_ROUND_UP(RADEON_MAX_DOORBELLS, BITS_PER_LONG)];
+ DECLARE_BITMAP(used, RADEON_MAX_DOORBELLS);
};
int radeon_doorbell_get(struct radeon_device *rdev, u32 *page);
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/infiniband/hw/ehca/ipz_pt_fn.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.h b/drivers/infiniband/hw/ehca/ipz_pt_fn.h
index a801274..19bc344 100644
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.h
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.h
@@ -65,7 +65,7 @@ struct ipz_page {
struct ipz_small_queue_page {
unsigned long page;
- unsigned long bitmap[IPZ_SPAGE_PER_KPAGE / BITS_PER_LONG];
+ DECLARE_BITMAP(bitmap, IPZ_SPAGE_PER_KPAGE);
int fill;
void *mapped_addr;
u32 mmap_count;
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/md/bcache/journal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index fe080ad..ce64fc8 100644
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -157,7 +157,7 @@ int bch_journal_read(struct cache_set *c, struct list_head *list)
for_each_cache(ca, c, iter) {
struct journal_device *ja = &ca->journal;
- unsigned long bitmap[SB_JOURNAL_BUCKETS / BITS_PER_LONG];
+ DECLARE_BITMAP(bitmap, SB_JOURNAL_BUCKETS);
unsigned i, l, r, m;
uint64_t seq;
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/ethernet/toshiba/spider_net.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c
index 8e9371a..3c54a2c 100644
--- a/drivers/net/ethernet/toshiba/spider_net.c
+++ b/drivers/net/ethernet/toshiba/spider_net.c
@@ -604,8 +604,7 @@ spider_net_set_multi(struct net_device *netdev)
int i;
u32 reg;
struct spider_net_card *card = netdev_priv(netdev);
- unsigned long bitmask[SPIDER_NET_MULTICAST_HASHES / BITS_PER_LONG] =
- {0, };
+ DECLARE_BITMAP(bitmask, SPIDER_NET_MULTICAST_HASHES) = {};
spider_net_set_promisc(card);
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/s390/char/sclp_cmd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index a186918..f74c040 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -186,7 +186,7 @@ int sclp_cpu_deconfigure(u8 cpu)
static DEFINE_MUTEX(sclp_mem_mutex);
static LIST_HEAD(sclp_mem_list);
static u8 sclp_max_storage_id;
-static unsigned long sclp_storage_ids[256 / BITS_PER_LONG];
+static DECLARE_BITMAP(sclp_storage_ids, 256);
static int sclp_mem_state_changed;
struct memory_increment {
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/qla4xxx/ql4_def.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 8f6d0fb..32341ac 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -795,7 +795,7 @@ struct scsi_qla_host {
#define CHAP_DMA_BLOCK_SIZE 512
struct workqueue_struct *task_wq;
- unsigned long ddb_idx_map[MAX_DDB_ENTRIES / BITS_PER_LONG];
+ DECLARE_BITMAP(ddb_idx_map, MAX_DDB_ENTRIES);
#define SYSFS_FLAG_FW_SEL_BOOT 2
struct iscsi_boot_kset *boot_kset;
struct ql4_boot_tgt_info boot_tgt;
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/sr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 8bd54a6..f40c957 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -99,7 +99,7 @@ static struct scsi_driver sr_template = {
.done = sr_done,
};
-static unsigned long sr_index_bits[SR_DISKS / BITS_PER_LONG];
+static DECLARE_BITMAP(sr_index_bits, SR_DISKS);
static DEFINE_SPINLOCK(sr_index_lock);
/* This semaphore is used to mediate the 0->1 reference get in the
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
Signed-off-by: Joe Perches <[email protected]>
---
fs/logfs/logfs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h
index 5f09376..9b8d8a6 100644
--- a/fs/logfs/logfs.h
+++ b/fs/logfs/logfs.h
@@ -301,7 +301,7 @@ struct logfs_block {
struct page *page;
struct inode *inode;
struct logfs_transaction *ta;
- unsigned long alias_map[LOGFS_BLOCK_FACTOR / BITS_PER_LONG];
+ DECLARE_BITMAP(alias_map, LOGFS_BLOCK_FACTOR);
struct logfs_block_ops *ops;
int full;
int partial;
--
2.1.2
Use the generic mechanism to declare a bitmap instead of unsigned long.
Signed-off-by: Joe Perches <[email protected]>
---
net/sunrpc/auth_gss/svcauth_gss.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 1095be9..e417476 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -320,7 +320,7 @@ struct gss_svc_seq_data {
int sd_max;
/* for i such that sd_max-GSS_SEQ_WIN < i <= sd_max, the i-th bit of
* sd_win is nonzero iff sequence number i has been seen already: */
- unsigned long sd_win[GSS_SEQ_WIN/BITS_PER_LONG];
+ DECLARE_BITMAP(sd_win, GSS_SEQ_WIN);
spinlock_t sd_lock;
};
--
2.1.2
On 05/20/15 03:37, Joe Perches wrote:
> Use the generic mechanism to declare a bitmap instead of unsigned long.
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/scsi/sr.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
> index 8bd54a6..f40c957 100644
> --- a/drivers/scsi/sr.c
> +++ b/drivers/scsi/sr.c
> @@ -99,7 +99,7 @@ static struct scsi_driver sr_template = {
> .done = sr_done,
> };
>
> -static unsigned long sr_index_bits[SR_DISKS / BITS_PER_LONG];
> +static DECLARE_BITMAP(sr_index_bits, SR_DISKS);
> static DEFINE_SPINLOCK(sr_index_lock);
>
> /* This semaphore is used to mediate the 0->1 reference get in the
Reviewed-by: Bart Van Assche <[email protected]>
Hello,
On Tue, May 19, 2015 at 06:37:49PM -0700, Joe Perches wrote:
> Use the generic mechanism to declare a bitmap instead of unsigned long.
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> arch/arm/mach-imx/iomux-imx31.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-imx/iomux-imx31.c b/arch/arm/mach-imx/iomux-imx31.c
> index d6a3075..6dd22ca 100644
> --- a/arch/arm/mach-imx/iomux-imx31.c
> +++ b/arch/arm/mach-imx/iomux-imx31.c
> @@ -40,7 +40,7 @@ static DEFINE_SPINLOCK(gpio_mux_lock);
>
> #define IOMUX_REG_MASK (IOMUX_PADNUM_MASK & ~0x3)
>
> -static unsigned long mxc_pin_alloc_map[NB_PORTS * 32 / BITS_PER_LONG];
> +static DECLARE_BITMAP(mxc_pin_alloc_map, NB_PORTS * 32);
> /*
> * set the mode for a IOMUX pin.
> */
Compile tested and
Acked-by: Uwe Kleine-K?nig <[email protected]>
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
On Tue, May 19, 2015 at 06:37:56PM -0700, Joe Perches wrote:
> Use the generic mechanism to declare a bitmap instead of unsigned long.
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/s390/char/sclp_cmd.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
On Wed, May 20, 2015 at 4:37 AM, Joe Perches <[email protected]> wrote:
> Use the generic mechanism to declare a bitmap instead of unsigned long.
>
> It seems that "struct kfd_process.allocated_queue_bitmap" is unused.
> Maybe it could be deleted instead.
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> index f21fcce..aba3e5d 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> @@ -150,8 +150,7 @@ struct kfd_dev {
>
> const struct kfd2kgd_calls *kfd2kgd;
> struct mutex doorbell_mutex;
> - unsigned long doorbell_available_index[DIV_ROUND_UP(
> - KFD_MAX_NUM_OF_QUEUES_PER_PROCESS, BITS_PER_LONG)];
> + DECLARE_BITMAP(doorbell_available_index, KFD_MAX_NUM_OF_QUEUES_PER_PROCESS);
>
> void *gtt_mem;
> uint64_t gtt_start_gpu_addr;
> @@ -473,7 +472,7 @@ struct kfd_process {
> /* Size is queue_array_size, up to MAX_PROCESS_QUEUES. */
> struct kfd_queue **queues;
>
> - unsigned long allocated_queue_bitmap[DIV_ROUND_UP(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS, BITS_PER_LONG)];
> + DECLARE_BITMAP(allocated_queue_bitmap, KFD_MAX_NUM_OF_QUEUES_PER_PROCESS);
>
> /*Is the user space process 32 bit?*/
> bool is_32bit_user_mode;
> --
> 2.1.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
Thanks!
I indeed deleted the allocated_queue_bitmap and squashed it into your
patch. It was a residue from a very early version.
Applied to my -next branch.
Oded
> -----Original Message-----
> From: Joe Perches [mailto:[email protected]]
> Sent: Wednesday, May 20, 2015 7:08 AM
> To: linux-kernel; Dept-Eng QLogic Storage Upstream
> Cc: James E.J. Bottomley; linux-scsi
> Subject: [PATCH 09/12] [SCSI] qla4xxx: Use DECLARE_BITMAP
>
> Use the generic mechanism to declare a bitmap instead of unsigned long.
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/scsi/qla4xxx/ql4_def.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
> index 8f6d0fb..32341ac 100644
> --- a/drivers/scsi/qla4xxx/ql4_def.h
> +++ b/drivers/scsi/qla4xxx/ql4_def.h
> @@ -795,7 +795,7 @@ struct scsi_qla_host {
>
> #define CHAP_DMA_BLOCK_SIZE 512
> struct workqueue_struct *task_wq;
> - unsigned long ddb_idx_map[MAX_DDB_ENTRIES / BITS_PER_LONG];
> + DECLARE_BITMAP(ddb_idx_map, MAX_DDB_ENTRIES);
> #define SYSFS_FLAG_FW_SEL_BOOT 2
> struct iscsi_boot_kset *boot_kset;
> struct ql4_boot_tgt_info boot_tgt;
> --
> 2.1.2
Reviewed-by: Nilesh Javali <[email protected]>
On Tue, May 19, 2015 at 9:37 PM, Joe Perches <[email protected]> wrote:
> Use the generic mechanism to declare a bitmap instead of unsigned long.
>
> Signed-off-by: Joe Perches <[email protected]>
Applied to my -next tree. thanks!
Alex
> ---
> drivers/gpu/drm/radeon/radeon.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> index 46eb0fa..d556733 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -719,7 +719,7 @@ struct radeon_doorbell {
> resource_size_t size;
> u32 __iomem *ptr;
> u32 num_doorbells; /* Number of doorbells actually reserved for radeon. */
> - unsigned long used[DIV_ROUND_UP(RADEON_MAX_DOORBELLS, BITS_PER_LONG)];
> + DECLARE_BITMAP(used, RADEON_MAX_DOORBELLS);
> };
>
> int radeon_doorbell_get(struct radeon_device *rdev, u32 *page);
> --
> 2.1.2
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
On Tue, May 19, 2015 at 06:37:49PM -0700, Joe Perches wrote:
> Use the generic mechanism to declare a bitmap instead of unsigned long.
>
> Signed-off-by: Joe Perches <[email protected]>
Applied, thanks.
From: Joe Perches <[email protected]>
Date: Tue, 19 May 2015 18:37:55 -0700
> Use the generic mechanism to declare a bitmap instead of unsigned long.
>
> Signed-off-by: Joe Perches <[email protected]>
Applied to net-next, thanks Joe.
On Tue, May 19, 2015 at 06:37:50PM -0700, Joe Perches wrote:
> Use the generic mechanism to declare a bitmap instead of unsigned long.
>
Applied, thanks
--
~Vinod