Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 984b3f5746ed2cde3d184651dabf26980f2b66e5

Authored by Akinobu Mita
Committed by Linus Torvalds
1 parent e3cb91ce1a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

bitops: rename for_each_bit() to for_each_set_bit() 

Rename for_each_bit to for_each_set_bit in the kernel source tree.  To
permit for_each_clear_bit(), should that ever be added.

The patch includes a macro to map the old for_each_bit() onto the new
for_each_set_bit().  This is a (very) temporary thing to ease the migration.

[akpm@linux-foundation.org: add temporary for_each_bit()]
Suggested-by: Alexey Dobriyan <adobriyan@gmail.com>
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Artem Bityutskiy <dedekind@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 18 changed files with 26 additions and 24 deletions Side-by-side Diff

arch/x86/kernel/cpu/perf_event.c
Diff comments   View file @ 984b3f5
... ... @@ -676,7 +676,7 @@
676 676 if (c->weight != w)
677 677 continue;
678 678  
679   - for_each_bit(j, c->idxmsk, X86_PMC_IDX_MAX) {
  679 + for_each_set_bit(j, c->idxmsk, X86_PMC_IDX_MAX) {
680 680 if (!test_bit(j, used_mask))
681 681 break;
682 682 }
arch/x86/kernel/cpu/perf_event_intel.c
Diff comments   View file @ 984b3f5
... ... @@ -757,7 +757,7 @@
757 757  
758 758 inc_irq_stat(apic_perf_irqs);
759 759 ack = status;
760   - for_each_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
  760 + for_each_set_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
761 761 struct perf_event *event = cpuc->events[bit];
762 762  
763 763 clear_bit(bit, (unsigned long *) &status);
drivers/dma/ioat/dma.c
Diff comments   View file @ 984b3f5
... ... @@ -71,7 +71,7 @@
71 71 }
72 72  
73 73 attnstatus = readl(instance->reg_base + IOAT_ATTNSTATUS_OFFSET);
74   - for_each_bit(bit, &attnstatus, BITS_PER_LONG) {
  74 + for_each_set_bit(bit, &attnstatus, BITS_PER_LONG) {
75 75 chan = ioat_chan_by_index(instance, bit);
76 76 tasklet_schedule(&chan->cleanup_task);
77 77 }
drivers/gpio/pl061.c
Diff comments   View file @ 984b3f5
... ... @@ -219,7 +219,7 @@
219 219 if (pending == 0)
220 220 continue;
221 221  
222   - for_each_bit(offset, &pending, PL061_GPIO_NR)
  222 + for_each_set_bit(offset, &pending, PL061_GPIO_NR)
223 223 generic_handle_irq(pl061_to_irq(&chip->gc, offset));
224 224 }
225 225 desc->chip->unmask(irq);
drivers/gpio/timbgpio.c
Diff comments   View file @ 984b3f5
... ... @@ -175,7 +175,7 @@
175 175 ipr = ioread32(tgpio->membase + TGPIO_IPR);
176 176 iowrite32(ipr, tgpio->membase + TGPIO_ICR);
177 177  
178   - for_each_bit(offset, &ipr, tgpio->gpio.ngpio)
  178 + for_each_set_bit(offset, &ipr, tgpio->gpio.ngpio)
179 179 generic_handle_irq(timbgpio_to_irq(&tgpio->gpio, offset));
180 180 }
181 181  
drivers/i2c/busses/i2c-designware.c
Diff comments   View file @ 984b3f5
... ... @@ -497,13 +497,13 @@
497 497 int i;
498 498  
499 499 if (abort_source & DW_IC_TX_ABRT_NOACK) {
500   - for_each_bit(i, &abort_source, ARRAY_SIZE(abort_sources))
  500 + for_each_set_bit(i, &abort_source, ARRAY_SIZE(abort_sources))
501 501 dev_dbg(dev->dev,
502 502 "%s: %s\n", __func__, abort_sources[i]);
503 503 return -EREMOTEIO;
504 504 }
505 505  
506   - for_each_bit(i, &abort_source, ARRAY_SIZE(abort_sources))
  506 + for_each_set_bit(i, &abort_source, ARRAY_SIZE(abort_sources))
507 507 dev_err(dev->dev, "%s: %s\n", __func__, abort_sources[i]);
508 508  
509 509 if (abort_source & DW_IC_TX_ARB_LOST)
drivers/mfd/htc-egpio.c
Diff comments   View file @ 984b3f5
... ... @@ -108,7 +108,7 @@
108 108 ack_irqs(ei);
109 109 /* Process all set pins. */
110 110 readval &= ei->irqs_enabled;
111   - for_each_bit(irqpin, &readval, ei->nirqs) {
  111 + for_each_set_bit(irqpin, &readval, ei->nirqs) {
112 112 /* Run irq handler */
113 113 pr_debug("got IRQ %d\n", irqpin);
114 114 irq = ei->irq_start + irqpin;
drivers/misc/sgi-xp/xpnet.c
Diff comments   View file @ 984b3f5
... ... @@ -475,7 +475,7 @@
475 475  
476 476 if (skb->data[0] == 0xff) {
477 477 /* we are being asked to broadcast to all partitions */
478   - for_each_bit(dest_partid, xpnet_broadcast_partitions,
  478 + for_each_set_bit(dest_partid, xpnet_broadcast_partitions,
479 479 xp_max_npartitions) {
480 480  
481 481 xpnet_send(skb, queued_msg, start_addr, end_addr,
drivers/net/gianfar.c
Diff comments   View file @ 984b3f5
... ... @@ -998,7 +998,7 @@
998 998 }
999 999  
1000 1000 /* Need to reverse the bit maps as bit_map's MSB is q0
1001   - * but, for_each_bit parses from right to left, which
  1001 + * but, for_each_set_bit parses from right to left, which
1002 1002 * basically reverses the queue numbers */
1003 1003 for (i = 0; i< priv->num_grps; i++) {
1004 1004 priv->gfargrp[i].tx_bit_map = reverse_bitmap(
... ... @@ -1011,7 +1011,7 @@
1011 1011 * also assign queues to groups */
1012 1012 for (grp_idx = 0; grp_idx < priv->num_grps; grp_idx++) {
1013 1013 priv->gfargrp[grp_idx].num_rx_queues = 0x0;
1014   - for_each_bit(i, &priv->gfargrp[grp_idx].rx_bit_map,
  1014 + for_each_set_bit(i, &priv->gfargrp[grp_idx].rx_bit_map,
1015 1015 priv->num_rx_queues) {
1016 1016 priv->gfargrp[grp_idx].num_rx_queues++;
1017 1017 priv->rx_queue[i]->grp = &priv->gfargrp[grp_idx];
... ... @@ -1019,7 +1019,7 @@
1019 1019 rqueue = rqueue | ((RQUEUE_EN0 | RQUEUE_EX0) >> i);
1020 1020 }
1021 1021 priv->gfargrp[grp_idx].num_tx_queues = 0x0;
1022   - for_each_bit (i, &priv->gfargrp[grp_idx].tx_bit_map,
  1022 + for_each_set_bit(i, &priv->gfargrp[grp_idx].tx_bit_map,
1023 1023 priv->num_tx_queues) {
1024 1024 priv->gfargrp[grp_idx].num_tx_queues++;
1025 1025 priv->tx_queue[i]->grp = &priv->gfargrp[grp_idx];
... ... @@ -1709,7 +1709,7 @@
1709 1709  
1710 1710 if (priv->mode == MQ_MG_MODE) {
1711 1711 baddr = &regs->txic0;
1712   - for_each_bit (i, &tx_mask, priv->num_tx_queues) {
  1712 + for_each_set_bit(i, &tx_mask, priv->num_tx_queues) {
1713 1713 if (likely(priv->tx_queue[i]->txcoalescing)) {
1714 1714 gfar_write(baddr + i, 0);
1715 1715 gfar_write(baddr + i, priv->tx_queue[i]->txic);
... ... @@ -1717,7 +1717,7 @@
1717 1717 }
1718 1718  
1719 1719 baddr = &regs->rxic0;
1720   - for_each_bit (i, &rx_mask, priv->num_rx_queues) {
  1720 + for_each_set_bit(i, &rx_mask, priv->num_rx_queues) {
1721 1721 if (likely(priv->rx_queue[i]->rxcoalescing)) {
1722 1722 gfar_write(baddr + i, 0);
1723 1723 gfar_write(baddr + i, priv->rx_queue[i]->rxic);
... ... @@ -2607,7 +2607,7 @@
2607 2607 budget_per_queue = left_over_budget/num_queues;
2608 2608 left_over_budget = 0;
2609 2609  
2610   - for_each_bit(i, &gfargrp->rx_bit_map, priv->num_rx_queues) {
  2610 + for_each_set_bit(i, &gfargrp->rx_bit_map, priv->num_rx_queues) {
2611 2611 if (test_bit(i, &serviced_queues))
2612 2612 continue;
2613 2613 rx_queue = priv->rx_queue[i];
drivers/net/ixgbe/ixgbe_main.c
Diff comments   View file @ 984b3f5
... ... @@ -1050,7 +1050,7 @@
1050 1050 */
1051 1051 for (v_idx = 0; v_idx < q_vectors; v_idx++) {
1052 1052 q_vector = adapter->q_vector[v_idx];
1053   - /* XXX for_each_bit(...) */
  1053 + /* XXX for_each_set_bit(...) */
1054 1054 r_idx = find_first_bit(q_vector->rxr_idx,
1055 1055 adapter->num_rx_queues);
1056 1056  
drivers/net/ixgbevf/ixgbevf_main.c
Diff comments   View file @ 984b3f5
... ... @@ -751,7 +751,7 @@
751 751 */
752 752 for (v_idx = 0; v_idx < q_vectors; v_idx++) {
753 753 q_vector = adapter->q_vector[v_idx];
754   - /* XXX for_each_bit(...) */
  754 + /* XXX for_each_set_bit(...) */
755 755 r_idx = find_first_bit(q_vector->rxr_idx,
756 756 adapter->num_rx_queues);
757 757  
drivers/net/wireless/ath/ar9170/main.c
Diff comments   View file @ 984b3f5
... ... @@ -394,7 +394,7 @@
394 394 ieee80211_tx_status_irqsafe(ar->hw, skb);
395 395 }
396 396  
397   - for_each_bit(i, &queue_bitmap, BITS_PER_BYTE) {
  397 + for_each_set_bit(i, &queue_bitmap, BITS_PER_BYTE) {
398 398 #ifdef AR9170_QUEUE_STOP_DEBUG
399 399 printk(KERN_DEBUG "%s: wake queue %d\n",
400 400 wiphy_name(ar->hw->wiphy), i);
drivers/net/wireless/iwmc3200wifi/debugfs.c
Diff comments   View file @ 984b3f5
... ... @@ -89,7 +89,7 @@
89 89 for (i = 0; i < __IWM_DM_NR; i++)
90 90 iwm->dbg.dbg_module[i] = 0;
91 91  
92   - for_each_bit(bit, &iwm->dbg.dbg_modules, __IWM_DM_NR)
  92 + for_each_set_bit(bit, &iwm->dbg.dbg_modules, __IWM_DM_NR)
93 93 iwm->dbg.dbg_module[bit] = iwm->dbg.dbg_level;
94 94  
95 95 return 0;
drivers/net/wireless/iwmc3200wifi/rx.c
Diff comments   View file @ 984b3f5
... ... @@ -1116,7 +1116,7 @@
1116 1116 return -EINVAL;
1117 1117 }
1118 1118  
1119   - for_each_bit(bit, (unsigned long *)&tid_msk, IWM_UMAC_TID_NR) {
  1119 + for_each_set_bit(bit, (unsigned long *)&tid_msk, IWM_UMAC_TID_NR) {
1120 1120 tid_info = &sta_info->tid_info[bit];
1121 1121  
1122 1122 mutex_lock(&tid_info->mutex);
fs/ocfs2/quota_local.c
Diff comments   View file @ 984b3f5
... ... @@ -457,7 +457,7 @@
457 457 break;
458 458 }
459 459 dchunk = (struct ocfs2_local_disk_chunk *)hbh->b_data;
460   - for_each_bit(bit, rchunk->rc_bitmap, ol_chunk_entries(sb)) {
  460 + for_each_set_bit(bit, rchunk->rc_bitmap, ol_chunk_entries(sb)) {
461 461 qbh = NULL;
462 462 status = ocfs2_read_quota_block(lqinode,
463 463 ol_dqblk_block(sb, chunk, bit),
include/linux/bitops.h
Diff comments   View file @ 984b3f5
... ... @@ -16,11 +16,13 @@
16 16 */
17 17 #include <asm/bitops.h>
18 18  
19   -#define for_each_bit(bit, addr, size) \
  19 +#define for_each_set_bit(bit, addr, size) \
20 20 for ((bit) = find_first_bit((addr), (size)); \
21 21 (bit) < (size); \
22 22 (bit) = find_next_bit((addr), (size), (bit) + 1))
23 23  
  24 +/* Temporary */
  25 +#define for_each_bit(bit, addr, size) for_each_set_bit(bit, addr, size)
24 26  
25 27 static __inline__ int get_bitmask_order(unsigned int count)
26 28 {
kernel/sched_cpupri.c
Diff comments   View file @ 984b3f5
... ... @@ -47,7 +47,7 @@
47 47 }
48 48  
49 49 #define for_each_cpupri_active(array, idx) \
50   - for_each_bit(idx, array, CPUPRI_NR_PRIORITIES)
  50 + for_each_set_bit(idx, array, CPUPRI_NR_PRIORITIES)
51 51  
52 52 /**
53 53 * cpupri_find - find the best (lowest-pri) CPU in the system
sound/soc/codecs/uda1380.c
Diff comments   View file @ 984b3f5
... ... @@ -137,7 +137,7 @@
137 137 {
138 138 int bit, reg;
139 139  
140   - for_each_bit(bit, &uda1380_cache_dirty, UDA1380_CACHEREGNUM - 0x10) {
  140 + for_each_set_bit(bit, &uda1380_cache_dirty, UDA1380_CACHEREGNUM - 0x10) {
141 141 reg = 0x10 + bit;
142 142 pr_debug("uda1380: flush reg %x val %x:\n", reg,
143 143 uda1380_read_reg_cache(uda1380_codec, reg));