i2c: only check scl functions when using generic recovery

Wolfram Sang · Wolfram Sang · commit 3a9ddaf4dca8 · 2016-05-13T12:37:03.000+02:00
A custom recovery function doesn't need these pointers to be populated
because it may work differently internally.

Signed-off-by: Wolfram Sang &lt;wsa@the-dreams.de&gt;
Tested-by: Peter Griffin &lt;peter.griffin@linaro.org&gt;
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
@@ -1594,10 +1594,12 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
 
 			bri->get_scl = get_scl_gpio_value;
 			bri->set_scl = set_scl_gpio_value;
-		} else if (!bri->set_scl || !bri->get_scl) {
+		} else if (bri->recover_bus == i2c_generic_scl_recovery) {
 			/* Generic SCL recovery */
-			dev_err(&adap->dev, "No {get|set}_gpio() found, not using recovery\n");
-			adap->bus_recovery_info = NULL;
+			if (!bri->set_scl || !bri->get_scl) {
+				dev_err(&adap->dev, "No {get|set}_scl() found, not using recovery\n");
+				adap->bus_recovery_info = NULL;
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1594,10 +1594,12 @@ static int i2c_register_adapter(struct i2c_adapter *adap)`
`1594`	`1594`
`1595`	`1595`	`bri->get_scl = get_scl_gpio_value;`
`1596`	`1596`	`bri->set_scl = set_scl_gpio_value;`
`1597`		`- } else if (!bri->set_scl \|\| !bri->get_scl) {`
	`1597`	`+ } else if (bri->recover_bus == i2c_generic_scl_recovery) {`
`1598`	`1598`	`/* Generic SCL recovery */`
`1599`		`- dev_err(&adap->dev, "No {get\|set}_gpio() found, not using recovery\n");`
`1600`		`- adap->bus_recovery_info = NULL;`
	`1599`	`+ if (!bri->set_scl \|\| !bri->get_scl) {`
	`1600`	`+ dev_err(&adap->dev, "No {get\|set}_scl() found, not using recovery\n");`
	`1601`	`+ adap->bus_recovery_info = NULL;`
	`1602`	`+ }`
`1601`	`1603`	`}`
`1602`	`1604`	`}`
`1603`	`1605`