Skip to content

Commit bb7d93f

Browse files
Wolfram Sangwsakernel
authored andcommitted
drm: encoder_slave: use new I2C API
i2c_new_client() is deprecated, use the replacement i2c_new_client_device(). Also, we have a helper to check if a driver is bound. Use it to simplify the code. Note that this changes the errno for a failed device creation from ENOMEM to ENODEV. No callers currently interpret this errno, though, so we use this condensed error check. Signed-off-by: Wolfram Sang <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Acked-by: Daniel Vetter <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent f78d403 commit bb7d93f

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

drivers/gpu/drm/drm_encoder_slave.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,8 @@ int drm_i2c_encoder_init(struct drm_device *dev,
6161

6262
request_module("%s%s", I2C_MODULE_PREFIX, info->type);
6363

64-
client = i2c_new_device(adap, info);
65-
if (!client) {
66-
err = -ENOMEM;
67-
goto fail;
68-
}
69-
70-
if (!client->dev.driver) {
64+
client = i2c_new_client_device(adap, info);
65+
if (!i2c_client_has_driver(client)) {
7166
err = -ENODEV;
7267
goto fail_unregister;
7368
}
@@ -96,7 +91,6 @@ int drm_i2c_encoder_init(struct drm_device *dev,
9691
module_put(module);
9792
fail_unregister:
9893
i2c_unregister_device(client);
99-
fail:
10094
return err;
10195
}
10296
EXPORT_SYMBOL(drm_i2c_encoder_init);

0 commit comments

Comments
 (0)