Commit cf17b950 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fix from Wolfram Sang:
 "A host driver build fix"

* tag 'i2c-for-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: pxa: hide unused icr_bits[] variable
parents 9520c192 5ceeabb0

drivers/i2c/busses/i2c-pxa.c

+1 −1
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ static void decode_ISR(unsigned int val) 
	decode_bits(KERN_DEBUG "ISR", isr_bits, ARRAY_SIZE(isr_bits), val);

}



#ifdef CONFIG_I2C_PXA_SLAVE

static const struct bits icr_bits[] = {

	PXA_BIT(ICR_START,  "START",	NULL),

	PXA_BIT(ICR_STOP,   "STOP",	NULL),
@@ -342,7 +343,6 @@ static const struct bits icr_bits[] = { 
	PXA_BIT(ICR_UR,     "UR",		"ur"),

};



#ifdef CONFIG_I2C_PXA_SLAVE

static void decode_ICR(unsigned int val)

{

	decode_bits(KERN_DEBUG "ICR", icr_bits, ARRAY_SIZE(icr_bits), val);