bitops: rename for_each_bit to for_each_set_bit
Subsystems (21)
PATCH 1/9 bitops: rename for_each_bit to for_each_set_bit
Rename for_each_bit to for_each_set_bit in the kernel source tree.
--- arch/x86/kernel/cpu/perf_event.c | 4 ++-- drivers/dma/ioat/dma.c | 2 +- drivers/gpio/pl061.c | 2 +- drivers/gpio/timbgpio.c | 2 +- drivers/i2c/busses/i2c-designware.c | 4 ++-- drivers/mfd/htc-egpio.c | 2 +- drivers/misc/sgi-xp/xpnet.c | 2 +- drivers/net/gianfar.c | 12 ++++++------ drivers/net/ixgbe/ixgbe_main.c | 2 +- drivers/net/wireless/ath/ar9170/main.c | 2 +- drivers/net/wireless/iwmc3200wifi/debugfs.c | 2 +- drivers/net/wireless/iwmc3200wifi/rx.c | 2 +- fs/ocfs2/quota_local.c | 2 +- include/linux/bitops.h | 2 +- sound/soc/codecs/uda1380.c | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-)
arch/x86/kernel/cpu/perf_event.c +2 -2
@@ -1456,7 +1456,7 @@ intel_get_event_idx(struct cpu_hw_events *cpuc, struct hw_perf_event *hwc)for_each_event_constraint (event_constraint, event_constraints) {if (code == event_constraint->code) { -for_each_bit (i, event_constraint->idxmsk,X86_PMC_IDX_MAX ) { +for_each_set_bit (i, event_constraint->idxmsk,X86_PMC_IDX_MAX ) {if (!test_and_set_bit (i, cpuc->used_mask))return i; }
@@ -1827,7 +1827,7 @@ again:inc_irq_stat (apic_perf_irqs); ack = status; -for_each_bit (bit, (unsigned long *)&status,X86_PMC_IDX_MAX ) { +for_each_set_bit (bit, (unsigned long *)&status,X86_PMC_IDX_MAX ) {struct perf_event *event = cpuc->events[bit];clear_bit (bit, (unsigned long *) &status);
drivers/dma/ioat/dma.c +1 -1
@@ -71,7 +71,7 @@ static irqreturn_t ioat_dma_do_interrupt(int irq, void *data) } attnstatus =readl (instance->reg_base +IOAT_ATTNSTATUS_OFFSET ); -for_each_bit (bit, &attnstatus,BITS_PER_LONG ) { +for_each_set_bit (bit, &attnstatus,BITS_PER_LONG ) { chan =ioat_chan_by_index (instance, bit);tasklet_schedule (&chan->cleanup_task); }
drivers/gpio/pl061.c +1 -1
@@ -219,7 +219,7 @@ static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)if (pending ==0 )continue ; -for_each_bit (offset, &pending,PL061_GPIO_NR ) +for_each_set_bit (offset, &pending,PL061_GPIO_NR )generic_handle_irq (pl061_to_irq (&chip->gc, offset)); } desc->chip->unmask (irq);
drivers/gpio/timbgpio.c +1 -1
@@ -174,7 +174,7 @@ static void timbgpio_irq(unsigned int irq, struct irq_desc *desc) ipr =ioread32 (tgpio->membase +TGPIO_IPR );iowrite32 (ipr, tgpio->membase +TGPIO_ICR ); -for_each_bit (offset, &ipr, tgpio->gpio.ngpio) +for_each_set_bit (offset, &ipr, tgpio->gpio.ngpio)generic_handle_irq (timbgpio_to_irq (&tgpio->gpio, offset)); }
drivers/i2c/busses/i2c-designware.c +2 -2
@@ -497,13 +497,13 @@ static int i2c_dw_handle_tx_abort(struct dw_i2c_dev *dev)int i;if (abort_source &DW_IC_TX_ABRT_NOACK ) { -for_each_bit (i, &abort_source,ARRAY_SIZE (abort_sources)) +for_each_set_bit (i, &abort_source,ARRAY_SIZE (abort_sources))dev_dbg (dev->dev,"%s: %s\n" , __func__, abort_sources[i]);return -EREMOTEIO ; } -for_each_bit (i, &abort_source,ARRAY_SIZE (abort_sources)) +for_each_set_bit (i, &abort_source,ARRAY_SIZE (abort_sources))dev_err (dev->dev,"%s: %s\n" , __func__, abort_sources[i]);if (abort_source &DW_IC_TX_ARB_LOST )
drivers/mfd/htc-egpio.c +1 -1
@@ -108,7 +108,7 @@ static void egpio_handler(unsigned int irq, struct irq_desc *desc)ack_irqs (ei);/* Process all set pins. */ readval &= ei->irqs_enabled; -for_each_bit (irqpin, &readval, ei->nirqs) { +for_each_set_bit (irqpin, &readval, ei->nirqs) {/* Run irq handler */ pr_debug ("got IRQ %d\n" , irqpin); irq = ei->irq_start + irqpin;
drivers/misc/sgi-xp/xpnet.c +1 -1
@@ -475,7 +475,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)if (skb->data[0 ] ==0xff ) {/* we are being asked to broadcast to all partitions */ -for_each_bit (dest_partid, xpnet_broadcast_partitions, +for_each_set_bit (dest_partid, xpnet_broadcast_partitions, xp_max_npartitions) { xpnet_send(skb, queued_msg, start_addr, end_addr,
drivers/net/gianfar.c +6 -6
@@ -998,7 +998,7 @@ static int gfar_probe(struct of_device *ofdev, }/* Need to reverse the bit maps as bit_map's MSB is q0 -* but, for_each_bit parses from right to left, which +* but, for_each_set_bit parses from right to left, which * basically reverses the queue numbers */ for (i =0 ; i< priv->num_grps; i++) { priv->gfargrp[i].tx_bit_map = reverse_bitmap(
@@ -1011,7 +1011,7 @@ static int gfar_probe(struct of_device *ofdev,* also assign queues to groups */ for (grp_idx =0 ; grp_idx < priv->num_grps; grp_idx++) { priv->gfargrp[grp_idx].num_rx_queues =0x0 ; -for_each_bit (i, &priv->gfargrp[grp_idx].rx_bit_map, +for_each_set_bit (i, &priv->gfargrp[grp_idx].rx_bit_map, priv->num_rx_queues) { priv->gfargrp[grp_idx].num_rx_queues++; priv->rx_queue[i]->grp = &priv->gfargrp[grp_idx];
@@ -1019,7 +1019,7 @@ static int gfar_probe(struct of_device *ofdev, rqueue = rqueue | ((RQUEUE_EN0 |RQUEUE_EX0 ) >> i); } priv->gfargrp[grp_idx].num_tx_queues =0x0 ; -for_each_bit (i, &priv->gfargrp[grp_idx].tx_bit_map, +for_each_set_bit (i, &priv->gfargrp[grp_idx].tx_bit_map, priv->num_tx_queues) { priv->gfargrp[grp_idx].num_tx_queues++; priv->tx_queue[i]->grp = &priv->gfargrp[grp_idx];
@@ -1709,7 +1709,7 @@ void gfar_configure_coalescing(struct gfar_private *priv,if (priv->mode ==MQ_MG_MODE ) { baddr = ®s->txic0; - for_each_bit (i, &tx_mask, priv->num_tx_queues) { +for_each_set_bit (i, &tx_mask, priv->num_tx_queues) {if (likely (priv->tx_queue[i]->txcoalescing)) {gfar_write (baddr + i,0 );gfar_write (baddr + i, priv->tx_queue[i]->txic);
@@ -1717,7 +1717,7 @@ void gfar_configure_coalescing(struct gfar_private *priv, } baddr = ®s->rxic0; - for_each_bit (i, &rx_mask, priv->num_rx_queues) { +for_each_set_bit (i, &rx_mask, priv->num_rx_queues) {if (likely (priv->rx_queue[i]->rxcoalescing)) {gfar_write (baddr + i,0 );gfar_write (baddr + i, priv->rx_queue[i]->rxic);
@@ -2607,7 +2607,7 @@ static int gfar_poll(struct napi_struct *napi, int budget) budget_per_queue = left_over_budget/num_queues; left_over_budget =0 ; -for_each_bit (i, &gfargrp->rx_bit_map, priv->num_rx_queues) { +for_each_set_bit (i, &gfargrp->rx_bit_map, priv->num_rx_queues) {if (test_bit (i, &serviced_queues))continue ; rx_queue = priv->rx_queue[i];
drivers/net/ixgbe/ixgbe_main.c +1 -1
@@ -984,7 +984,7 @@ static void ixgbe_configure_msix(struct ixgbe_adapter *adapter)*/ for (v_idx =0 ; v_idx < q_vectors; v_idx++) { q_vector = adapter->q_vector[v_idx]; -/* XXX for_each_bit(...) */ +/* XXX for_each_set_bit(...) */ r_idx =find_first_bit (q_vector->rxr_idx, adapter->num_rx_queues);
drivers/net/wireless/ath/ar9170/main.c +1 -1
@@ -391,7 +391,7 @@ static void ar9170_tx_fake_ampdu_status(struct ar9170 *ar)ieee80211_tx_status_irqsafe (ar->hw, skb); } -for_each_bit (i, &queue_bitmap,BITS_PER_BYTE ) { +for_each_set_bit (i, &queue_bitmap,BITS_PER_BYTE ) {#ifdef AR9170_QUEUE_STOP_DEBUG printk (KERN_DEBUG "%s: wake queue %d\n" ,wiphy_name (ar->hw->wiphy), i);
drivers/net/wireless/iwmc3200wifi/debugfs.c +1 -1
@@ -89,7 +89,7 @@ static int iwm_debugfs_dbg_modules_write(void *data, u64 val)for (i =0 ; i < __IWM_DM_NR; i++) iwm->dbg.dbg_module[i] =0 ; -for_each_bit (bit, &iwm->dbg.dbg_modules, __IWM_DM_NR) +for_each_set_bit (bit, &iwm->dbg.dbg_modules, __IWM_DM_NR) iwm->dbg.dbg_module[bit] = iwm->dbg.dbg_level;return 0 ;
drivers/net/wireless/iwmc3200wifi/rx.c +1 -1
@@ -1117,7 +1117,7 @@ static int iwm_ntf_stop_resume_tx(struct iwm_priv *iwm, u8 *buf,return -EINVAL ; } -for_each_bit (bit, (unsigned long *)&tid_msk,IWM_UMAC_TID_NR ) { +for_each_set_bit (bit, (unsigned long *)&tid_msk,IWM_UMAC_TID_NR ) { tid_info = &sta_info->tid_info[bit];mutex_lock (&tid_info->mutex);
fs/ocfs2/quota_local.c +1 -1
@@ -457,7 +457,7 @@ static int ocfs2_recover_local_quota_file(struct inode *lqinode,break ; } dchunk = (struct ocfs2_local_disk_chunk *)hbh->b_data; -for_each_bit (bit, rchunk->rc_bitmap,ol_chunk_entries (sb)) { +for_each_set_bit (bit, rchunk->rc_bitmap,ol_chunk_entries (sb)) { qbh =NULL ; status = ocfs2_read_quota_block(lqinode, ol_dqblk_block(sb, chunk, bit),
include/linux/bitops.h +1 -1
@@ -16,7 +16,7 @@*/ #include <asm/bitops.h> -#define for_each_bit (bit, addr, size) \ +#define for_each_set_bit (bit, addr, size) \ for ((bit) = find_first_bit((addr), (size)); \ (bit) < (size); \ (bit) = find_next_bit((addr), (size), (bit) + 1))
sound/soc/codecs/uda1380.c +1 -1
@@ -137,7 +137,7 @@ static void uda1380_flush_work(struct work_struct *work) {int bit, reg; -for_each_bit (bit, &uda1380_cache_dirty,UDA1380_CACHEREGNUM -0x10 ) { +for_each_set_bit (bit, &uda1380_cache_dirty,UDA1380_CACHEREGNUM -0x10 ) { reg =0x10 + bit;pr_debug ("uda1380: flush reg %x val %x:\n" , reg,uda1380_read_reg_cache (uda1380_codec, reg));
Signature · 1 line
1.6.0.6
PATCH 2/9 sgi-gru: Use for_each_set_bit
--- drivers/misc/sgi-gru/grutables.h | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-)
drivers/misc/sgi-gru/grutables.h +4 -11
@@ -516,8 +516,7 @@ struct gru_blade_state {/* Scan all active GRUs in a GRU bitmap */ #define for_each_gru_in_bitmap (gid, map) \ - for ((gid) = find_first_bit((map), GRU_MAX_GRUS); (gid) < GRU_MAX_GRUS;\ - (gid)++, (gid) = find_next_bit((map), GRU_MAX_GRUS, (gid))) + for_each_set_bit((gid), (map), GRU_MAX_GRUS)/* Scan all active GRUs on a specific blade */ #define for_each_gru_on_blade (gru, nid, i) \
@@ -536,23 +535,17 @@ struct gru_blade_state {/* Scan each CBR whose bit is set in a TFM (or copy of) */ #define for_each_cbr_in_tfm (i, map) \ - for ((i) = find_first_bit(map, GRU_NUM_CBE); \ - (i) < GRU_NUM_CBE; \ - (i)++, (i) = find_next_bit(map, GRU_NUM_CBE, i)) + for_each_set_bit((i), (map), GRU_NUM_CBE)/* Scan each CBR in a CBR bitmap. Note: multiple CBRs in an allocation unit */ #define for_each_cbr_in_allocation_map (i, map, k) \ - for ((k) = find_first_bit(map, GRU_CBR_AU); (k) < GRU_CBR_AU; \ - (k) = find_next_bit(map, GRU_CBR_AU, (k) + 1)) \ + for_each_set_bit((k), (map), GRU_CBR_AU) \ for ((i) = (k)*GRU_CBR_AU_SIZE; \ (i) < ((k) + 1) * GRU_CBR_AU_SIZE; (i)++)/* Scan each DSR in a DSR bitmap. Note: multiple DSRs in an allocation unit */ #define for_each_dsr_in_allocation_map (i, map, k) \ - for ((k) = find_first_bit((const unsigned long *)map, GRU_DSR_AU);\ - (k) < GRU_DSR_AU; \ - (k) = find_next_bit((const unsigned long *)map, \ - GRU_DSR_AU, (k) + 1)) \ + for_each_set_bit((k), (const unsigned long *)(map), GRU_DSR_AU) \ for ((i) = (k) * GRU_DSR_AU_CL; \ (i) < ((k) + 1) * GRU_DSR_AU_CL; (i)++)
Signature · 1 line
1.6.0.6
PATCH 3/9 sched: Use for_each_set_bit
In reply to Akinobu Mitav2: rename for_each_bit to for_each_set_bit
--- kernel/sched_cpupri.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
kernel/sched_cpupri.c +1 -3
@@ -47,9 +47,7 @@ static int convert_prio(int prio) }#define for_each_cpupri_active (array, idx) \ - for (idx = find_first_bit(array, CPUPRI_NR_PRIORITIES); \ - idx < CPUPRI_NR_PRIORITIES; \ - idx = find_next_bit(array, CPUPRI_NR_PRIORITIES, idx+1)) + for_each_set_bit(idx, array, CPUPRI_NR_PRIORITIES)/** * cpupri_find - find the best (lowest-pri) CPU in the system
Signature · 1 line
1.6.0.6
PATCH 4/9 bitmap: Use for_each_set_bit
In reply to Akinobu Mitav2: rename for_each_bit to for_each_set_bit
--- lib/bitmap.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-)
lib/bitmap.c +4 -9
@@ -733,10 +733,9 @@ void bitmap_remap(unsigned long *dst, const unsigned long *src,bitmap_zero (dst, bits); w =bitmap_weight (new, bits); -for (oldbit =find_first_bit (src, bits); - oldbit < bits; - oldbit =find_next_bit (src, bits, oldbit +1 )) { +for_each_set_bit (oldbit, src, bits) {int n =bitmap_pos_to_ord (old, oldbit, bits); +if (n <0 || w ==0 )set_bit (oldbit, dst);/* identity map */ else
@@ -903,9 +902,7 @@ void bitmap_onto(unsigned long *dst, const unsigned long *orig,*/ m =0 ; -for (n =find_first_bit (relmap, bits); - n < bits; - n =find_next_bit (relmap, bits, n +1 )) { +for_each_set_bit (n, relmap, bits) {/* m == bitmap_pos_to_ord(relmap, n, bits) */ if (test_bit (m, orig))set_bit (n, dst);
@@ -934,9 +931,7 @@ void bitmap_fold(unsigned long *dst, const unsigned long *orig,return ;bitmap_zero (dst, bits); -for (oldbit =find_first_bit (orig, bits); - oldbit < bits; - oldbit =find_next_bit (orig, bits, oldbit +1 )) +for_each_set_bit (oldbit, orig, bits)set_bit (oldbit % sz, dst); }EXPORT_SYMBOL (bitmap_fold);
Signature · 1 line
1.6.0.6
PATCH 5/9 phonet: Use for_each_set_bit
In reply to Akinobu Mitav2: rename for_each_bit to for_each_set_bit
--- net/phonet/pn_dev.c | 3 +-- net/phonet/pn_netlink.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
net/phonet/pn_dev.c +1 -2
@@ -107,8 +107,7 @@ static void phonet_device_destroy(struct net_device *dev)if (pnd) {u8 addr; -for (addr =find_first_bit (pnd->addrs,64 ); addr <64 ; - addr =find_next_bit (pnd->addrs,64 ,1 +addr)) +for_each_set_bit (addr, pnd->addrs,64 )phonet_address_notify (RTM_DELADDR , dev, addr);kfree (pnd); }
net/phonet/pn_netlink.c +1 -2
@@ -141,8 +141,7 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)continue ; addr_idx =0 ; -for (addr =find_first_bit (pnd->addrs,64 ); addr <64 ; - addr =find_next_bit (pnd->addrs,64 ,1 +addr)) { +for_each_set_bit (addr, pnd->addrs,64 ) {if (addr_idx++ < addr_start_idx)continue ;
Signature · 1 line
1.6.0.6
PATCH 6/9 intel-iommu: Use for_each_set_bit
In reply to Akinobu Mitav2: rename for_each_bit to for_each_set_bit
--- drivers/pci/intel-iommu.c | 33 +++++++-------------------------- 1 files changed, 7 insertions(+), 26 deletions(-)
drivers/pci/intel-iommu.c +7 -26
@@ -491,13 +491,11 @@ static void domain_update_iommu_coherency(struct dmar_domain *domain) domain->iommu_coherency =1 ; - i =find_first_bit (&domain->iommu_bmp, g_num_of_iommus); -for (; i < g_num_of_iommus; ) { +for_each_set_bit (i, &domain->iommu_bmp, g_num_of_iommus) {if (!ecap_coherent (g_iommus[i]->ecap)) { domain->iommu_coherency =0 ;break ; } - i =find_next_bit (&domain->iommu_bmp, g_num_of_iommus, i+1 ); } }
@@ -507,13 +505,11 @@ static void domain_update_iommu_snooping(struct dmar_domain *domain) domain->iommu_snooping =1 ; - i =find_first_bit (&domain->iommu_bmp, g_num_of_iommus); -for (; i < g_num_of_iommus; ) { +for_each_set_bit (i, &domain->iommu_bmp, g_num_of_iommus) {if (!ecap_sc_support (g_iommus[i]->ecap)) { domain->iommu_snooping =0 ;break ; } - i =find_next_bit (&domain->iommu_bmp, g_num_of_iommus, i+1 ); } }
@@ -1194,8 +1190,7 @@ void free_dmar_iommu(struct intel_iommu *iommu)unsigned long flags;if ((iommu->domains) && (iommu->domain_ids)) { - i =find_first_bit (iommu->domain_ids,cap_ndoms (iommu->cap)); -for (; i <cap_ndoms (iommu->cap); ) { +for_each_set_bit (i, iommu->domain_ids,cap_ndoms (iommu->cap)) { domain = iommu->domains[i];clear_bit (i, iommu->domain_ids);
@@ -1207,9 +1202,6 @@ void free_dmar_iommu(struct intel_iommu *iommu)domain_exit (domain); }spin_unlock_irqrestore (&domain->iommu_lock, flags); - - i =find_next_bit (iommu->domain_ids, -cap_ndoms (iommu->cap), i+1 ); } }
@@ -1292,14 +1284,11 @@ static void iommu_detach_domain(struct dmar_domain *domain,spin_lock_irqsave (&iommu->lock, flags); ndomains =cap_ndoms (iommu->cap); - num =find_first_bit (iommu->domain_ids, ndomains); -for (; num < ndomains; ) { +for_each_set_bit (num, iommu->domain_ids, ndomains) {if (iommu->domains[num] == domain) { found =1 ;break ; } - num =find_next_bit (iommu->domain_ids, -cap_ndoms (iommu->cap), num+1 ); }if (found) {
@@ -1485,15 +1474,12 @@ static int domain_context_mapping_one(struct dmar_domain *domain, int segment,/* find an available domain id for this device in iommu */ ndomains =cap_ndoms (iommu->cap); - num =find_first_bit (iommu->domain_ids, ndomains); -for (; num < ndomains; ) { +for_each_set_bit (num, iommu->domain_ids, ndomains) {if (iommu->domains[num] == domain) { id = num; found =1 ;break ; } - num =find_next_bit (iommu->domain_ids, -cap_ndoms (iommu->cap), num+1 ); }if (found ==0 ) {
@@ -3441,12 +3427,9 @@ static int vm_domain_min_agaw(struct dmar_domain *domain)int i;int min_agaw = domain->agaw; - i =find_first_bit (&domain->iommu_bmp, g_num_of_iommus); -for (; i < g_num_of_iommus; ) { +for_each_set_bit (i, &domain->iommu_bmp, g_num_of_iommus) {if (min_agaw > g_iommus[i]->agaw) min_agaw = g_iommus[i]->agaw; - - i =find_next_bit (&domain->iommu_bmp, g_num_of_iommus, i+1 ); }return min_agaw;
@@ -3512,8 +3495,7 @@ static void iommu_free_vm_domain(struct dmar_domain *domain) iommu = drhd->iommu; ndomains =cap_ndoms (iommu->cap); - i =find_first_bit (iommu->domain_ids, ndomains); -for (; i < ndomains; ) { +for_each_set_bit (i, iommu->domain_ids, ndomains) {if (iommu->domains[i] == domain) {spin_lock_irqsave (&iommu->lock, flags);clear_bit (i, iommu->domain_ids);
@@ -3521,7 +3503,6 @@ static void iommu_free_vm_domain(struct dmar_domain *domain)spin_unlock_irqrestore (&iommu->lock, flags);break ; } - i =find_next_bit (iommu->domain_ids, ndomains, i+1 ); } } }
Signature · 1 line
1.6.0.6
PATCH 7/9 infiniband: Use for_each_set_bit
In reply to Akinobu Mitav2: rename for_each_bit to for_each_set_bit
--- drivers/infiniband/core/mad.c | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-)
drivers/infiniband/core/mad.c +5 -16
@@ -1193,10 +1193,7 @@ static int method_in_use(struct ib_mad_mgmt_method_table **method, {int i; -for (i =find_first_bit (mad_reg_req->method_mask,IB_MGMT_MAX_METHODS ); - i <IB_MGMT_MAX_METHODS ; - i =find_next_bit (mad_reg_req->method_mask,IB_MGMT_MAX_METHODS , -1 +i)) { +for_each_set_bit (i, mad_reg_req->method_mask,IB_MGMT_MAX_METHODS ) {if ((*method)->agent[i]) { printk(KERN_ERR PFX "Method %d already in use\n", i);return -EINVAL ;
@@ -1330,13 +1327,9 @@ static int add_nonoui_reg_req(struct ib_mad_reg_req *mad_reg_req, goto error3;/* Finally, add in methods being registered */ -for (i =find_first_bit (mad_reg_req->method_mask, -IB_MGMT_MAX_METHODS ); - i <IB_MGMT_MAX_METHODS ; - i =find_next_bit (mad_reg_req->method_mask,IB_MGMT_MAX_METHODS , -1 +i)) { +for_each_set_bit (i, mad_reg_req->method_mask,IB_MGMT_MAX_METHODS ) (*method)->agent[i] = agent_priv; - } +return 0 ; error3:
@@ -1429,13 +1422,9 @@ check_in_use: goto error4;/* Finally, add in methods being registered */ -for (i =find_first_bit (mad_reg_req->method_mask, -IB_MGMT_MAX_METHODS ); - i <IB_MGMT_MAX_METHODS ; - i =find_next_bit (mad_reg_req->method_mask,IB_MGMT_MAX_METHODS , -1 +i)) { +for_each_set_bit (i, mad_reg_req->method_mask,IB_MGMT_MAX_METHODS ) (*method)->agent[i] = agent_priv; - } +return 0 ; error4:
Signature · 6 lines
1.6.0.6 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 8/9 atm: Use for_each_set_bit
In reply to Akinobu Mitav2: rename for_each_bit to for_each_set_bit
--- drivers/atm/lanai.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
drivers/atm/lanai.c +3 -4
@@ -306,11 +306,10 @@ static void vci_bitfield_iterate(struct lanai_dev *lanai, const unsigned long *lp, void (*func)(struct lanai_dev *,vci_t vci)) { - vci_t vci =find_first_bit (lp,NUM_VCI ); -while (vci <NUM_VCI ) { + vci_t vci; + +for_each_set_bit (vci, lp,NUM_VCI )func (lanai, vci); - vci =find_next_bit (lp,NUM_VCI , vci +1 ); - } }/* -------------------- BUFFER UTILITIES: */
Signature · 1 line
1.6.0.6
PATCH 9/9 hpet: Use for_each_set_bit
In reply to Akinobu Mitav2: rename for_each_bit to for_each_set_bit
--- drivers/char/hpet.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/char/hpet.c +1 -3
@@ -215,9 +215,7 @@ static void hpet_timer_set_irq(struct hpet_dev *devp)else v &= ~0xffff ; -for (irq =find_first_bit (&v,HPET_MAX_IRQ ); irq <HPET_MAX_IRQ ; - irq =find_next_bit (&v,HPET_MAX_IRQ ,1 + irq)) { - +for_each_set_bit (irq, &v,HPET_MAX_IRQ ) {if (irq >= nr_irqs) { irq =HPET_MAX_IRQ ;break ;
Signature · 1 line
1.6.0.6
Quoted 1 line · Akinobu Mita
Rename
for_each_bittofor_each_set_bitin the kernel source tree.
I preferred the for_each_bit because it gives some naming consistency.
These look for set bits:
find_first_bit
find_next_bit
find_last_bit
These look for unset bits:
find_first_zero_bit
find_next_zero_bit
I think there should be 3 macros named:
for_each_bit
for_each_zero_bit
for_every_bit
and maybe there's a use for:
find_last_zero_bit
I think the macro definition should be located near these other functions in bitops.h and not placed somewhat randomly near the top of the file.
Hi,
Quoted 6 lines · On Tue, 2 Feb 2010 00:10:32 +0900 Akinobu Mita <[email protected]> wrote:
include/linux/bitops.h +0
-0
include/linux/bitops.h line 22
Quoted 8 lines
include/linux/bitops.h +1
-1@@ -16,7 +16,7 @@*/ #include <asm/bitops.h> -#define for_each_bit (bit, addr, size) \ +#define for_each_set_bit (bit, addr, size) \ for ((bit) = find_first_bit((addr), (size)); \ (bit) < (size); \ (bit) = find_next_bit((addr), (size), (bit) + 1))
If you also added
#define for_each_bit(bit, addr, size) for_each_set_bit((bit), (addr), (size))
Then the transition can be made not as painful i.e. less likely to impact on new users of for_each_bit() that may not currently be in Linus' tree.
(and the patch to bitops.h could be submitted on its own, and the other parts could be sent to their respective maintainer - which also lowers the pain for them with conflicts etc).
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/