aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2007-10-19 02:40:28 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 14:53:42 -0400
commited11399da5ac7a07dc470d9dee9a7846917ec4aa (patch)
treed4cd7fc2cf411e5879930b9295a2c10f62041c39 /drivers/i2c
parent532237eff1f271302ed923af6d811a699d582bbc (diff)
i2c-pxa, rename BIT macro to PXA_BIT
i2c-pxa, rename BIT macro to PXA_BIT BIT macro will be global definiton of (1 << x) Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Nicolas Pitre <nico@cam.org> Cc: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-pxa.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 00fad11733ad..6426a61f8d4d 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -85,7 +85,7 @@ struct bits {
85 const char *set; 85 const char *set;
86 const char *unset; 86 const char *unset;
87}; 87};
88#define BIT(m, s, u) { .mask = m, .set = s, .unset = u } 88#define PXA_BIT(m, s, u) { .mask = m, .set = s, .unset = u }
89 89
90static inline void 90static inline void
91decode_bits(const char *prefix, const struct bits *bits, int num, u32 val) 91decode_bits(const char *prefix, const struct bits *bits, int num, u32 val)
@@ -100,17 +100,17 @@ decode_bits(const char *prefix, const struct bits *bits, int num, u32 val)
100} 100}
101 101
102static const struct bits isr_bits[] = { 102static const struct bits isr_bits[] = {
103 BIT(ISR_RWM, "RX", "TX"), 103 PXA_BIT(ISR_RWM, "RX", "TX"),
104 BIT(ISR_ACKNAK, "NAK", "ACK"), 104 PXA_BIT(ISR_ACKNAK, "NAK", "ACK"),
105 BIT(ISR_UB, "Bsy", "Rdy"), 105 PXA_BIT(ISR_UB, "Bsy", "Rdy"),
106 BIT(ISR_IBB, "BusBsy", "BusRdy"), 106 PXA_BIT(ISR_IBB, "BusBsy", "BusRdy"),
107 BIT(ISR_SSD, "SlaveStop", NULL), 107 PXA_BIT(ISR_SSD, "SlaveStop", NULL),
108 BIT(ISR_ALD, "ALD", NULL), 108 PXA_BIT(ISR_ALD, "ALD", NULL),
109 BIT(ISR_ITE, "TxEmpty", NULL), 109 PXA_BIT(ISR_ITE, "TxEmpty", NULL),
110 BIT(ISR_IRF, "RxFull", NULL), 110 PXA_BIT(ISR_IRF, "RxFull", NULL),
111 BIT(ISR_GCAD, "GenCall", NULL), 111 PXA_BIT(ISR_GCAD, "GenCall", NULL),
112 BIT(ISR_SAD, "SlaveAddr", NULL), 112 PXA_BIT(ISR_SAD, "SlaveAddr", NULL),
113 BIT(ISR_BED, "BusErr", NULL), 113 PXA_BIT(ISR_BED, "BusErr", NULL),
114}; 114};
115 115
116static void decode_ISR(unsigned int val) 116static void decode_ISR(unsigned int val)
@@ -120,21 +120,21 @@ static void decode_ISR(unsigned int val)
120} 120}
121 121
122static const struct bits icr_bits[] = { 122static const struct bits icr_bits[] = {
123 BIT(ICR_START, "START", NULL), 123 PXA_BIT(ICR_START, "START", NULL),
124 BIT(ICR_STOP, "STOP", NULL), 124 PXA_BIT(ICR_STOP, "STOP", NULL),
125 BIT(ICR_ACKNAK, "ACKNAK", NULL), 125 PXA_BIT(ICR_ACKNAK, "ACKNAK", NULL),
126 BIT(ICR_TB, "TB", NULL), 126 PXA_BIT(ICR_TB, "TB", NULL),
127 BIT(ICR_MA, "MA", NULL), 127 PXA_BIT(ICR_MA, "MA", NULL),
128 BIT(ICR_SCLE, "SCLE", "scle"), 128 PXA_BIT(ICR_SCLE, "SCLE", "scle"),
129 BIT(ICR_IUE, "IUE", "iue"), 129 PXA_BIT(ICR_IUE, "IUE", "iue"),
130 BIT(ICR_GCD, "GCD", NULL), 130 PXA_BIT(ICR_GCD, "GCD", NULL),
131 BIT(ICR_ITEIE, "ITEIE", NULL), 131 PXA_BIT(ICR_ITEIE, "ITEIE", NULL),
132 BIT(ICR_IRFIE, "IRFIE", NULL), 132 PXA_BIT(ICR_IRFIE, "IRFIE", NULL),
133 BIT(ICR_BEIE, "BEIE", NULL), 133 PXA_BIT(ICR_BEIE, "BEIE", NULL),
134 BIT(ICR_SSDIE, "SSDIE", NULL), 134 PXA_BIT(ICR_SSDIE, "SSDIE", NULL),
135 BIT(ICR_ALDIE, "ALDIE", NULL), 135 PXA_BIT(ICR_ALDIE, "ALDIE", NULL),
136 BIT(ICR_SADIE, "SADIE", NULL), 136 PXA_BIT(ICR_SADIE, "SADIE", NULL),
137 BIT(ICR_UR, "UR", "ur"), 137 PXA_BIT(ICR_UR, "UR", "ur"),
138}; 138};
139 139
140static void decode_ICR(unsigned int val) 140static void decode_ICR(unsigned int val)