i2c: Remove redundant 'driver' field from the i2c_client struct

The 'driver' field of the i2c_client struct is redundant. The same data can be
accessed through to_i2c_driver(client->dev.driver). The generated code for both
approaches in more or less the same.

E.g. on ARM the expression client->driver->command(...) generates

		...
		ldr     r3, [r0, #28]
		ldr     r3, [r3, #32]
		blx     r3
		...

and the expression to_i2c_driver(client->dev.driver)->command(...) generates

		...
		ldr     r3, [r0, #160]
    	ldr     r3, [r3, #-4]
    	blx     r3
		...

Other architectures will generate similar code.

All users of the 'driver' field outside of the I2C core have already been
converted. So this only leaves the core itself. This patch converts the
remaining few users in the I2C core and then removes the 'driver' field from the
i2c_client struct.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

1 files changed, 12 insertions, 9 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 29d3f045a2bf..430c001b3f1e 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -248,17 +248,16 @@ static int i2c_device_probe(struct device *dev)
         driver = to_i2c_driver(dev->driver);
         if (!driver->probe || !driver->id_table)
                 return -ENODEV;
-        client->driver = driver;
+
         if (!device_can_wakeup(&client->dev))
                 device_init_wakeup(&client->dev,
                                         client->flags & I2C_CLIENT_WAKE);
         dev_dbg(dev, "probe\n");
 
         status = driver->probe(client, i2c_match_id(driver->id_table, client));
-        if (status) {
-                client->driver = NULL;
+        if (status)
                 i2c_set_clientdata(client, NULL);
-        }
+
         return status;
 }
 
@@ -279,10 +278,9 @@ static int i2c_device_remove(struct device *dev)
                 dev->driver = NULL;
                 status = 0;
         }
-        if (status == 0) {
-                client->driver = NULL;
+        if (status == 0)
                 i2c_set_clientdata(client, NULL);
-        }
+
         return status;
 }
 
@@ -1606,9 +1604,14 @@ static int i2c_cmd(struct device *dev, void *_arg)
 {
         struct i2c_client       *client = i2c_verify_client(dev);
         struct i2c_cmd_arg      *arg = _arg;
+        struct i2c_driver       *driver;
+
+        if (!client || !client->dev.driver)
+                return 0;
 
-        if (client && client->driver && client->driver->command)
-                client->driver->command(client, arg->cmd, arg->arg);
+        driver = to_i2c_driver(client->dev.driver);
+        if (driver->command)
+                driver->command(client, arg->cmd, arg->arg);
         return 0;
 }