Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Lars-Peter Clausen and committed by
Wolfram Sang
3ee81b7a f9d32f25

+4 -4
+4 -4
drivers/gpu/drm/drm_encoder_slave.c
··· 67 67 goto fail; 68 68 } 69 69 70 - if (!client->driver) { 70 + if (!client->dev.driver) { 71 71 err = -ENODEV; 72 72 goto fail_unregister; 73 73 } 74 74 75 - module = client->driver->driver.owner; 75 + module = client->dev.driver->owner; 76 76 if (!try_module_get(module)) { 77 77 err = -ENODEV; 78 78 goto fail_unregister; ··· 80 80 81 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 85 err = encoder_drv->encoder_init(client, dev, encoder); 86 86 if (err) ··· 111 111 { 112 112 struct drm_encoder_slave *encoder = to_encoder_slave(drm_encoder); 113 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 116 i2c_unregister_device(client); 117 117 encoder->bus_priv = NULL;