OSDN Git Service

drm/bridge: analogix-anx78xx: convert to i2c_new_dummy_device
authorBrian Masney <masneyb@onstation.org>
Thu, 15 Aug 2019 00:48:47 +0000 (20:48 -0400)
committerAndrzej Hajda <a.hajda@samsung.com>
Mon, 16 Sep 2019 09:17:00 +0000 (11:17 +0200)
The i2c_new_dummy() function is deprecated since it returns NULL on
error. Change this to use the recommended replacement
i2c_new_dummy_device() that returns an error code that can be read with
PTR_ERR() and friends.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190815004854.19860-5-masneyb@onstation.org
drivers/gpu/drm/bridge/analogix-anx78xx.c

index 5efadb8..31118d3 100644 (file)
@@ -1356,15 +1356,18 @@ static int anx78xx_i2c_probe(struct i2c_client *client,
 
        /* Map slave addresses of ANX7814 */
        for (i = 0; i < I2C_NUM_ADDRESSES; i++) {
-               anx78xx->i2c_dummy[i] = i2c_new_dummy(client->adapter,
-                                               anx78xx_i2c_addresses[i] >> 1);
-               if (!anx78xx->i2c_dummy[i]) {
-                       err = -ENOMEM;
-                       DRM_ERROR("Failed to reserve I2C bus %02x\n",
-                                 anx78xx_i2c_addresses[i]);
+               struct i2c_client *i2c_dummy;
+
+               i2c_dummy = i2c_new_dummy_device(client->adapter,
+                                                anx78xx_i2c_addresses[i] >> 1);
+               if (IS_ERR(i2c_dummy)) {
+                       err = PTR_ERR(i2c_dummy);
+                       DRM_ERROR("Failed to reserve I2C bus %02x: %d\n",
+                                 anx78xx_i2c_addresses[i], err);
                        goto err_unregister_i2c;
                }
 
+               anx78xx->i2c_dummy[i] = i2c_dummy;
                anx78xx->map[i] = devm_regmap_init_i2c(anx78xx->i2c_dummy[i],
                                                       &anx78xx_regmap_config);
                if (IS_ERR(anx78xx->map[i])) {