Remove unnecessary adjustment for bit number and address of bitmask.
This change just simplifies the code a bit.

Signed-off-by: Akinobu Mita <akinobu.m...@gmail.com>
Cc: Don Brace <don.br...@pmcs.com>
Cc: iss_storage...@hp.com
---
 drivers/block/cpqarray.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 2b94403..34dde22 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -422,8 +422,8 @@ static int cpqarray_register_ctlr(int i, struct pci_dev 
*pdev)
        hba[i]->cmd_pool = pci_alloc_consistent(
                hba[i]->pci_dev, NR_CMDS * sizeof(cmdlist_t),
                &(hba[i]->cmd_pool_dhandle));
-       hba[i]->cmd_pool_bits = kcalloc(
-               DIV_ROUND_UP(NR_CMDS, BITS_PER_LONG), sizeof(unsigned long),
+       hba[i]->cmd_pool_bits = kcalloc(BITS_TO_LONGS(NR_CMDS),
+               sizeof(unsigned long),
                GFP_KERNEL);
 
        if (!hba[i]->cmd_pool_bits || !hba[i]->cmd_pool)
@@ -1373,7 +1373,7 @@ static cmdlist_t * cmd_alloc(ctlr_info_t *h, int 
get_from_pool)
                        i = find_first_zero_bit(h->cmd_pool_bits, NR_CMDS);
                        if (i == 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;
                cmd_dhandle = h->cmd_pool_dhandle + i*sizeof(cmdlist_t);
                h->nr_allocs++;
@@ -1393,7 +1393,7 @@ static void cmd_free(ctlr_info_t *h, cmdlist_t *c, int 
got_from_pool)
                        c->busaddr);
        } else {
                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++;
        }
 }
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to