Merge branch 'i2c/for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c updates from Wolfram Sang:
 "Here is the 4.9 pull request from I2C including:

   - centralized error messages when registering to the core
   - improved lockdep annotations to prevent false positives
   - DT support for muxes, gates, and arbitrators
   - bus speeds can now be obtained from ACPI
   - i2c-octeon got refactored and now supports ThunderX SoCs, too
   - i2c-tegra and i2c-designware got a bigger bunch of updates
   - a couple of standard driver fixes and improvements"

* 'i2c/for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (71 commits)
  i2c: axxia: disable clks in case of failure in probe
  i2c: octeon: thunderx: Limit register access retries
  i2c: uniphier-f: fix misdetection of incomplete STOP condition
  gpio: pca953x: variable 'id' was used twice
  i2c: i801: Add support for Kaby Lake PCH-H
  gpio: pca953x: fix an incorrect lockdep warning
  i2c: add a warning to i2c_adapter_depth()
  lockdep: make MAX_LOCKDEP_SUBCLASSES unconditionally visible
  i2c: export i2c_adapter_depth()
  i2c: rk3x: Fix variable 'min_total_ns' unused warning
  i2c: rk3x: Fix sparse warning
  i2c / ACPI: Do not touch an I2C device if it belongs to another adapter
  i2c: octeon: Fix high-level controller status check
  i2c: octeon: Avoid sending STOP during recovery
  i2c: octeon: Fix set SCL recovery function
  i2c: rcar: add support for r8a7796 (R-Car M3-W)
  i2c: imx: make bus recovery through pinctrl optional
  i2c: meson: add gxbb compatible string
  i2c: uniphier-f: set the adapter to master mode when probing
  i2c: uniphier-f: avoid WARN_ON() of clk_disable() in failure path
  ...

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 5d059866d17a..45c8817d068c 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -732,7 +732,7 @@ out:
 static const struct of_device_id pca953x_dt_ids[];
 
 static int pca953x_probe(struct i2c_client *client,
-                                   const struct i2c_device_id *id)
+                                   const struct i2c_device_id *i2c_id)
 {
         struct pca953x_platform_data *pdata;
         struct pca953x_chip *chip;
@@ -773,27 +773,29 @@ static int pca953x_probe(struct i2c_client *client,
         }
         chip->regulator = reg;
 
-        if (id) {
-                chip->driver_data = id->driver_data;
+        if (i2c_id) {
+                chip->driver_data = i2c_id->driver_data;
         } else {
-                const struct acpi_device_id *id;
+                const struct acpi_device_id *acpi_id;
                 const struct of_device_id *match;
 
                 match = of_match_device(pca953x_dt_ids, &client->dev);
                 if (match) {
                         chip->driver_data = (int)(uintptr_t)match->data;
                 } else {
-                        id = acpi_match_device(pca953x_acpi_ids, &client->dev);
-                        if (!id) {
+                        acpi_id = acpi_match_device(pca953x_acpi_ids, &client->dev);
+                        if (!acpi_id) {
                                 ret = -ENODEV;
                                 goto err_exit;
                         }
 
-                        chip->driver_data = id->driver_data;
+                        chip->driver_data = acpi_id->driver_data;
                 }
         }
 
         mutex_init(&chip->i2c_lock);
+        lockdep_set_subclass(&chip->i2c_lock,
+                             i2c_adapter_depth(client->adapter));
 
         /* initialize cached registers from their original values.
          * we can't share this chip with another i2c master.