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

torvalds · torvalds · commit cf17b9503f17 · 2024-04-06T09:27:36.000-07:00
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
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,7 @@ static void decode_ISR(unsigned int val)`
`324`	`324`	`decode_bits(KERN_DEBUG "ISR", isr_bits, ARRAY_SIZE(isr_bits), val);`
`325`	`325`	`}`
`326`	`326`
	`327`	`+#ifdef CONFIG_I2C_PXA_SLAVE`
`327`	`328`	`static const struct bits icr_bits[] = {`
`328`	`329`	`PXA_BIT(ICR_START, "START", NULL),`
`329`	`330`	`PXA_BIT(ICR_STOP, "STOP", NULL),`
`@@ -342,7 +343,6 @@ static const struct bits icr_bits[] = {`
`342`	`343`	`PXA_BIT(ICR_UR, "UR", "ur"),`
`343`	`344`	`};`
`344`	`345`
`345`		`-#ifdef CONFIG_I2C_PXA_SLAVE`
`346`	`346`	`static void decode_ICR(unsigned int val)`
`347`	`347`	`{`
`348`	`348`	`decode_bits(KERN_DEBUG "ICR", icr_bits, ARRAY_SIZE(icr_bits), val);`