diff options
Diffstat (limited to 'drivers/gpu/drm/drm_encoder_slave.c')
| -rw-r--r-- | drivers/gpu/drm/drm_encoder_slave.c | 8 |
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, | |||
| 67 | goto fail; | 67 | goto fail; |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | if (!client->driver) { | 70 | if (!client->dev.driver) { |
| 71 | err = -ENODEV; | 71 | err = -ENODEV; |
| 72 | goto fail_unregister; | 72 | goto fail_unregister; |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | module = client->driver->driver.owner; | 75 | module = client->dev.driver->owner; |
| 76 | if (!try_module_get(module)) { | 76 | if (!try_module_get(module)) { |
| 77 | err = -ENODEV; | 77 | err = -ENODEV; |
| 78 | goto fail_unregister; | 78 | goto fail_unregister; |
| @@ -80,7 +80,7 @@ int drm_i2c_encoder_init(struct drm_device *dev, | |||
| 80 | 80 | ||
| 81 | encoder->bus_priv = client; | 81 | encoder->bus_priv = client; |
| 82 | 82 | ||
| 83 | encoder_drv = to_drm_i2c_encoder_driver(client->driver); | 83 | encoder_drv = to_drm_i2c_encoder_driver(to_i2c_driver(client->dev.driver)); |
| 84 | 84 | ||
| 85 | err = encoder_drv->encoder_init(client, dev, encoder); | 85 | err = encoder_drv->encoder_init(client, dev, encoder); |
| 86 | if (err) | 86 | if (err) |
| @@ -111,7 +111,7 @@ void drm_i2c_encoder_destroy(struct drm_encoder *drm_encoder) | |||
| 111 | { | 111 | { |
| 112 | struct drm_encoder_slave *encoder = to_encoder_slave(drm_encoder); | 112 | struct drm_encoder_slave *encoder = to_encoder_slave(drm_encoder); |
| 113 | struct i2c_client *client = drm_i2c_encoder_get_client(drm_encoder); | 113 | struct i2c_client *client = drm_i2c_encoder_get_client(drm_encoder); |
| 114 | struct module *module = client->driver->driver.owner; | 114 | struct module *module = client->dev.driver->owner; |
| 115 | 115 | ||
| 116 | i2c_unregister_device(client); | 116 | i2c_unregister_device(client); |
| 117 | encoder->bus_priv = NULL; | 117 | encoder->bus_priv = NULL; |
