* [PATCH] cciss: cleanup bitops usage
@ 2012-04-03 5:38 Akinobu Mita
2012-04-03 5:38 ` [PATCH] cciss: use check_signature Akinobu Mita
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Akinobu Mita @ 2012-04-03 5:38 UTC (permalink / raw)
To: linux-kernel; +Cc: Akinobu Mita, Mike Miller, iss_storagedev
- Remove unnecessary correction of bit and address
- Use BITS_TO_LONGS macro to calculate bitmap size
- Use bitmap_zero()
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Mike Miller <mike.miller@hp.com>
Cc: iss_storagedev@hp.com
---
drivers/block/cciss.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index b0f553b..bda6d12 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -41,6 +41,7 @@
#include <linux/spinlock.h>
#include <linux/compat.h>
#include <linux/mutex.h>
+#include <linux/bitmap.h>
#include <asm/uaccess.h>
#include <asm/io.h>
@@ -978,8 +979,7 @@ static CommandList_struct *cmd_alloc(ctlr_info_t *h)
i = find_first_zero_bit(h->cmd_pool_bits, h->nr_cmds);
if (i == h->nr_cmds)
return NULL;
- } while (test_and_set_bit(i & (BITS_PER_LONG - 1),
- h->cmd_pool_bits + (i / BITS_PER_LONG)) != 0);
+ } while (test_and_set_bit(i, h->cmd_pool_bits) != 0);
c = h->cmd_pool + i;
memset(c, 0, sizeof(CommandList_struct));
cmd_dma_handle = h->cmd_pool_dhandle + i * sizeof(CommandList_struct);
@@ -1046,8 +1046,7 @@ static void cmd_free(ctlr_info_t *h, CommandList_struct *c)
int i;
i = c - h->cmd_pool;
- clear_bit(i & (BITS_PER_LONG - 1),
- h->cmd_pool_bits + (i / BITS_PER_LONG));
+ clear_bit(i, h->cmd_pool_bits);
h->nr_frees++;
}
@@ -4812,8 +4811,7 @@ static __devinit int cciss_init_reset_devices(struct pci_dev *pdev)
static __devinit int cciss_allocate_cmd_pool(ctlr_info_t *h)
{
- h->cmd_pool_bits = kmalloc(
- DIV_ROUND_UP(h->nr_cmds, BITS_PER_LONG) *
+ h->cmd_pool_bits = kmalloc(BITS_TO_LONGS(h->nr_cmds) *
sizeof(unsigned long), GFP_KERNEL);
h->cmd_pool = pci_alloc_consistent(h->pdev,
h->nr_cmds * sizeof(CommandList_struct),
@@ -5068,9 +5066,7 @@ reinit_after_soft_reset:
pci_set_drvdata(pdev, h);
/* command and error info recs zeroed out before
they are used */
- memset(h->cmd_pool_bits, 0,
- DIV_ROUND_UP(h->nr_cmds, BITS_PER_LONG)
- * sizeof(unsigned long));
+ bitmap_zero(h->cmd_pool_bits, h->nr_cmds);
h->num_luns = 0;
h->highest_lun = -1;
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] cciss: use check_signature
2012-04-03 5:38 [PATCH] cciss: cleanup bitops usage Akinobu Mita
@ 2012-04-03 5:38 ` Akinobu Mita
2012-04-03 5:38 ` [PATCH] hpsa: cleanup bitops usage Akinobu Mita
2012-04-03 5:38 ` [PATCH] hpsa: use check_signature Akinobu Mita
2 siblings, 0 replies; 6+ messages in thread
From: Akinobu Mita @ 2012-04-03 5:38 UTC (permalink / raw)
To: linux-kernel; +Cc: Akinobu Mita, Mike Miller, iss_storagedev
Use check_signature to find a signature in the mmio address.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Mike Miller <mike.miller@hp.com>
Cc: iss_storagedev@hp.com
---
drivers/block/cciss.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index bda6d12..e04c63e 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -42,8 +42,8 @@
#include <linux/compat.h>
#include <linux/mutex.h>
#include <linux/bitmap.h>
+#include <linux/io.h>
#include <asm/uaccess.h>
-#include <asm/io.h>
#include <linux/dma-mapping.h>
#include <linux/blkdev.h>
@@ -4267,10 +4267,7 @@ static void __devinit cciss_find_board_params(ctlr_info_t *h)
static inline bool CISS_signature_present(ctlr_info_t *h)
{
- if ((readb(&h->cfgtable->Signature[0]) != 'C') ||
- (readb(&h->cfgtable->Signature[1]) != 'I') ||
- (readb(&h->cfgtable->Signature[2]) != 'S') ||
- (readb(&h->cfgtable->Signature[3]) != 'S')) {
+ if (!check_signature(h->cfgtable->Signature, "CISS", 4)) {
dev_warn(&h->pdev->dev, "not a valid CISS config table\n");
return false;
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] hpsa: cleanup bitops usage
2012-04-03 5:38 [PATCH] cciss: cleanup bitops usage Akinobu Mita
2012-04-03 5:38 ` [PATCH] cciss: use check_signature Akinobu Mita
@ 2012-04-03 5:38 ` Akinobu Mita
2012-04-03 5:38 ` [PATCH] hpsa: use check_signature Akinobu Mita
2 siblings, 0 replies; 6+ messages in thread
From: Akinobu Mita @ 2012-04-03 5:38 UTC (permalink / raw)
To: linux-kernel
Cc: Akinobu Mita, Stephen M. Cameron, iss_storagedev,
James E.J. Bottomley, linux-scsi
- Remove unnecessary correction of bit and address
- Use BITS_TO_LONGS macro to calculate bitmap size
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Cc: iss_storagedev@hp.com
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org
---
drivers/scsi/hpsa.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 500e20d..ddbf5fe 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -2351,9 +2351,7 @@ static struct CommandList *cmd_alloc(struct ctlr_info *h)
i = find_first_zero_bit(h->cmd_pool_bits, h->nr_cmds);
if (i == h->nr_cmds)
return NULL;
- } while (test_and_set_bit
- (i & (BITS_PER_LONG - 1),
- h->cmd_pool_bits + (i / BITS_PER_LONG)) != 0);
+ } while (test_and_set_bit(i, h->cmd_pool_bits) != 0);
c = h->cmd_pool + i;
memset(c, 0, sizeof(*c));
cmd_dma_handle = h->cmd_pool_dhandle
@@ -2420,8 +2418,7 @@ static void cmd_free(struct ctlr_info *h, struct CommandList *c)
int i;
i = c - h->cmd_pool;
- clear_bit(i & (BITS_PER_LONG - 1),
- h->cmd_pool_bits + (i / BITS_PER_LONG));
+ clear_bit(i, h->cmd_pool_bits);
h->nr_frees++;
}
@@ -4045,8 +4042,7 @@ static __devinit int hpsa_init_reset_devices(struct pci_dev *pdev)
static __devinit int hpsa_allocate_cmd_pool(struct ctlr_info *h)
{
- h->cmd_pool_bits = kzalloc(
- DIV_ROUND_UP(h->nr_cmds, BITS_PER_LONG) *
+ h->cmd_pool_bits = kzalloc(BITS_TO_LONGS(h->nr_cmds) *
sizeof(unsigned long), GFP_KERNEL);
h->cmd_pool = pci_alloc_consistent(h->pdev,
h->nr_cmds * sizeof(*h->cmd_pool),
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] hpsa: use check_signature
2012-04-03 5:38 [PATCH] cciss: cleanup bitops usage Akinobu Mita
2012-04-03 5:38 ` [PATCH] cciss: use check_signature Akinobu Mita
2012-04-03 5:38 ` [PATCH] hpsa: cleanup bitops usage Akinobu Mita
@ 2012-04-03 5:38 ` Akinobu Mita
2012-04-03 15:45 ` Mike Miller
2 siblings, 1 reply; 6+ messages in thread
From: Akinobu Mita @ 2012-04-03 5:38 UTC (permalink / raw)
To: linux-kernel
Cc: Akinobu Mita, Mike Miller, iss_storagedev, James E.J. Bottomley,
linux-scsi
Use check_signature to find a signature in the mmio address.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Mike Miller <mike.miller@hp.com>
Cc: iss_storagedev@hp.com
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org
---
drivers/scsi/hpsa.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index ddbf5fe..c867eeb 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3839,10 +3839,7 @@ static void __devinit hpsa_find_board_params(struct ctlr_info *h)
static inline bool hpsa_CISS_signature_present(struct ctlr_info *h)
{
- if ((readb(&h->cfgtable->Signature[0]) != 'C') ||
- (readb(&h->cfgtable->Signature[1]) != 'I') ||
- (readb(&h->cfgtable->Signature[2]) != 'S') ||
- (readb(&h->cfgtable->Signature[3]) != 'S')) {
+ if (!check_signature(h->cfgtable->Signature, "CISS", 4)) {
dev_warn(&h->pdev->dev, "not a valid CISS config table\n");
return false;
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] hpsa: use check_signature
2012-04-03 5:38 ` [PATCH] hpsa: use check_signature Akinobu Mita
@ 2012-04-03 15:45 ` Mike Miller
0 siblings, 0 replies; 6+ messages in thread
From: Mike Miller @ 2012-04-03 15:45 UTC (permalink / raw)
To: Akinobu Mita
Cc: linux-kernel, ISS StorageDev, James E.J. Bottomley, linux-scsi
On 04/03/2012 12:38 AM, Akinobu Mita wrote:
> Use check_signature to find a signature in the mmio address.
>
> Signed-off-by: Akinobu Mita<akinobu.mita@gmail.com>
> Cc: Mike Miller<mike.miller@hp.com>
> Cc: iss_storagedev@hp.com
> Cc: "James E.J. Bottomley"<JBottomley@parallels.com>
> Cc: linux-scsi@vger.kernel.org
Acked-by: Mike Miller <mike.miller@hp.com>
> ---
> drivers/scsi/hpsa.c | 5 +----
> 1 files changed, 1 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index ddbf5fe..c867eeb 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
> @@ -3839,10 +3839,7 @@ static void __devinit hpsa_find_board_params(struct ctlr_info *h)
>
> static inline bool hpsa_CISS_signature_present(struct ctlr_info *h)
> {
> - if ((readb(&h->cfgtable->Signature[0]) != 'C') ||
> - (readb(&h->cfgtable->Signature[1]) != 'I') ||
> - (readb(&h->cfgtable->Signature[2]) != 'S') ||
> - (readb(&h->cfgtable->Signature[3]) != 'S')) {
> + if (!check_signature(h->cfgtable->Signature, "CISS", 4)) {
> dev_warn(&h->pdev->dev, "not a valid CISS config table\n");
> return false;
> }
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] hpsa: cleanup bitops usage
@ 2015-03-14 1:12 Akinobu Mita
0 siblings, 0 replies; 6+ messages in thread
From: Akinobu Mita @ 2015-03-14 1:12 UTC (permalink / raw)
To: linux-kernel
Cc: Akinobu Mita, Don Brace, iss_storagedev, storagedev,
James E.J. Bottomley, linux-scsi
Remove unnecessary adjustment for bit number and address of bitmask,
and use BITS_TO_LONGS macro to calculate bitmap size. This change
just simplifies the code a bit.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Don Brace <don.brace@pmcs.com>
Cc: iss_storagedev@hp.com
Cc: storagedev@pmcs.com
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org
---
drivers/scsi/hpsa.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index a1cfbd3..73a282b 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -4697,8 +4697,7 @@ static struct CommandList *cmd_alloc(struct ctlr_info *h)
offset = (i + 1) % h->nr_cmds;
continue;
}
- set_bit(i & (BITS_PER_LONG - 1),
- h->cmd_pool_bits + (i / BITS_PER_LONG));
+ set_bit(i, h->cmd_pool_bits);
break; /* it's ours now. */
}
h->last_allocation = i; /* benignly racy */
@@ -4729,8 +4728,7 @@ static void cmd_free(struct ctlr_info *h, struct CommandList *c)
int i;
i = c - h->cmd_pool;
- clear_bit(i & (BITS_PER_LONG - 1),
- h->cmd_pool_bits + (i / BITS_PER_LONG));
+ clear_bit(i, h->cmd_pool_bits);
}
}
@@ -6410,8 +6408,7 @@ out_disable:
static int hpsa_allocate_cmd_pool(struct ctlr_info *h)
{
- h->cmd_pool_bits = kzalloc(
- DIV_ROUND_UP(h->nr_cmds, BITS_PER_LONG) *
+ h->cmd_pool_bits = kcalloc(BITS_TO_LONGS(h->nr_cmds),
sizeof(unsigned long), GFP_KERNEL);
h->cmd_pool = pci_alloc_consistent(h->pdev,
h->nr_cmds * sizeof(*h->cmd_pool),
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-03-14 1:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-03 5:38 [PATCH] cciss: cleanup bitops usage Akinobu Mita
2012-04-03 5:38 ` [PATCH] cciss: use check_signature Akinobu Mita
2012-04-03 5:38 ` [PATCH] hpsa: cleanup bitops usage Akinobu Mita
2012-04-03 5:38 ` [PATCH] hpsa: use check_signature Akinobu Mita
2012-04-03 15:45 ` Mike Miller
2015-03-14 1:12 [PATCH] hpsa: cleanup bitops usage Akinobu Mita
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).