Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed11399d authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

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: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Nicolas Pitre <nico@cam.org>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 532237ef

drivers/i2c/busses/i2c-pxa.c

+27 −27
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct bits { 
	const char *set;

	const char *unset;

};

#define BIT(m, s, u)	{ .mask = m, .set = s, .unset = u }

#define PXA_BIT(m, s, u)	{ .mask = m, .set = s, .unset = u }



static inline void

decode_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) 
}



static const struct bits isr_bits[] = {

	BIT(ISR_RWM,	"RX",		"TX"),

	BIT(ISR_ACKNAK,	"NAK",		"ACK"),

	BIT(ISR_UB,	"Bsy",		"Rdy"),

	BIT(ISR_IBB,	"BusBsy",	"BusRdy"),

	BIT(ISR_SSD,	"SlaveStop",	NULL),

	BIT(ISR_ALD,	"ALD",		NULL),

	BIT(ISR_ITE,	"TxEmpty",	NULL),

	BIT(ISR_IRF,	"RxFull",	NULL),

	BIT(ISR_GCAD,	"GenCall",	NULL),

	BIT(ISR_SAD,	"SlaveAddr",	NULL),

	BIT(ISR_BED,	"BusErr",	NULL),

	PXA_BIT(ISR_RWM,	"RX",		"TX"),

	PXA_BIT(ISR_ACKNAK,	"NAK",		"ACK"),

	PXA_BIT(ISR_UB,		"Bsy",		"Rdy"),

	PXA_BIT(ISR_IBB,	"BusBsy",	"BusRdy"),

	PXA_BIT(ISR_SSD,	"SlaveStop",	NULL),

	PXA_BIT(ISR_ALD,	"ALD",		NULL),

	PXA_BIT(ISR_ITE,	"TxEmpty",	NULL),

	PXA_BIT(ISR_IRF,	"RxFull",	NULL),

	PXA_BIT(ISR_GCAD,	"GenCall",	NULL),

	PXA_BIT(ISR_SAD,	"SlaveAddr",	NULL),

	PXA_BIT(ISR_BED,	"BusErr",	NULL),

};



static void decode_ISR(unsigned int val)
@@ -120,21 +120,21 @@ static void decode_ISR(unsigned int val) 
}



static const struct bits icr_bits[] = {

	BIT(ICR_START,  "START",	NULL),

	BIT(ICR_STOP,   "STOP",		NULL),

	BIT(ICR_ACKNAK, "ACKNAK",	NULL),

	BIT(ICR_TB,     "TB",		NULL),

	BIT(ICR_MA,     "MA",		NULL),

	BIT(ICR_SCLE,   "SCLE",		"scle"),

	BIT(ICR_IUE,    "IUE",		"iue"),

	BIT(ICR_GCD,    "GCD",		NULL),

	BIT(ICR_ITEIE,  "ITEIE",	NULL),

	BIT(ICR_IRFIE,  "IRFIE",	NULL),

	BIT(ICR_BEIE,   "BEIE",		NULL),

	BIT(ICR_SSDIE,  "SSDIE",	NULL),

	BIT(ICR_ALDIE,  "ALDIE",	NULL),

	BIT(ICR_SADIE,  "SADIE",	NULL),

	BIT(ICR_UR,     "UR",		"ur"),

	PXA_BIT(ICR_START,  "START",	NULL),

	PXA_BIT(ICR_STOP,   "STOP",	NULL),

	PXA_BIT(ICR_ACKNAK, "ACKNAK",	NULL),

	PXA_BIT(ICR_TB,     "TB",	NULL),

	PXA_BIT(ICR_MA,     "MA",	NULL),

	PXA_BIT(ICR_SCLE,   "SCLE",	"scle"),

	PXA_BIT(ICR_IUE,    "IUE",	"iue"),

	PXA_BIT(ICR_GCD,    "GCD",	NULL),

	PXA_BIT(ICR_ITEIE,  "ITEIE",	NULL),

	PXA_BIT(ICR_IRFIE,  "IRFIE",	NULL),

	PXA_BIT(ICR_BEIE,   "BEIE",	NULL),

	PXA_BIT(ICR_SSDIE,  "SSDIE",	NULL),

	PXA_BIT(ICR_ALDIE,  "ALDIE",	NULL),

	PXA_BIT(ICR_SADIE,  "SADIE",	NULL),

	PXA_BIT(ICR_UR,     "UR",		"ur"),

};



static void decode_ICR(unsigned int val)