aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_encoder_slave.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-09-29 10:51:02 +0200
committerWolfram Sang <wsa@the-dreams.de>2013-10-03 22:28:28 +0200
commit3ee81b7aefcc4d5c031dcac5df8683cadc7b6ee2 (patch)
tree5e6e025090ca8ffbe40ddd22641cc55f729b63c8 /drivers/gpu/drm/drm_encoder_slave.c
parentmedia: core: Don't use i2c_client->driver (diff)
downloadlinux-dev-3ee81b7aefcc4d5c031dcac5df8683cadc7b6ee2.tar.xz
linux-dev-3ee81b7aefcc4d5c031dcac5df8683cadc7b6ee2.zip
drm: encoder_slave: Don't use i2c_client->driver
The 'driver' field of the i2c_client struct is redundant and is going to be removed. The results of the expressions 'client->driver.driver->field' and 'client->dev.driver->field' are identical, so replace all occurrences of the former with the later. To get direct access to the i2c_driver struct use 'to_i2c_driver(client->dev.driver)'. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/gpu/drm/drm_encoder_slave.c')
-rw-r--r--drivers/gpu/drm/drm_encoder_slave.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c
index 0cfb60f54766..d18b88b755c3 100644
--- a/drivers/gpu/drm/drm_encoder_slave.c
+++ b/drivers/gpu/drm/drm_encoder_slave.c
@@ -67,12 +67,12 @@ int drm_i2c_encoder_init(struct drm_device *dev,
goto fail;
}
- if (!client->driver) {
+ if (!client->dev.driver) {
err = -ENODEV;
goto fail_unregister;
}
- module = client->driver->driver.owner;
+ module = client->dev.driver->owner;
if (!try_module_get(module)) {
err = -ENODEV;
goto fail_unregister;
@@ -80,7 +80,7 @@ int drm_i2c_encoder_init(struct drm_device *dev,
encoder->bus_priv = client;
- encoder_drv = to_drm_i2c_encoder_driver(client->driver);
+ encoder_drv = to_drm_i2c_encoder_driver(to_i2c_driver(client->dev.driver));
err = encoder_drv->encoder_init(client, dev, encoder);
if (err)
@@ -111,7 +111,7 @@ void drm_i2c_encoder_destroy(struct drm_encoder *drm_encoder)
{
struct drm_encoder_slave *encoder = to_encoder_slave(drm_encoder);
struct i2c_client *client = drm_i2c_encoder_get_client(drm_encoder);
- struct module *module = client->driver->driver.owner;
+ struct module *module = client->dev.driver->owner;
i2c_unregister_device(client);
encoder->bus_priv = NULL;