Merge tag 'optee-simplify-i2c-access_for-v5.12' of git://git.linaro.org/people/jens...

Simplify i2c acess in OP-TEE driver

* tag 'optee-simplify-i2c-access_for-v5.12' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  optee: simplify i2c access

Link: https://lore.kernel.org/soc/20210208125853.GA288348%40jade
Signed-off-by: Arnd Bergmann <[email protected]>

diff --cc drivers/tee/optee/rpc.c
index a0c30b664e53cd775af3ccbfd9574e8cc6a9ecd3,6cbb3643c6c48f600612d1172d3045080a95698d..1849180b0278b7112289d270a16ed7f9ad3b1629
--- 1/drivers/tee/optee/rpc.c
--- 2/drivers/tee/optee/rpc.c
+++ b/drivers/tee/optee/rpc.c
@@@ -86,34 -86,32 +87,32 @@@ static void handle_rpc_func_cmd_i2c_tra
                        goto bad;
        }
  
-       client.adapter = i2c_get_adapter(params[0].u.value.b);
-       if (!client.adapter)
+       adapter = i2c_get_adapter(params[0].u.value.b);
+       if (!adapter)
                goto bad;
  
 -      if (params[1].u.value.a & OPTEE_MSG_RPC_CMD_I2C_FLAGS_TEN_BIT) {
 +      if (params[1].u.value.a & OPTEE_RPC_I2C_FLAGS_TEN_BIT) {
-               if (!i2c_check_functionality(client.adapter,
+               if (!i2c_check_functionality(adapter,
                                             I2C_FUNC_10BIT_ADDR)) {
-                       i2c_put_adapter(client.adapter);
+                       i2c_put_adapter(adapter);
                        goto bad;
                }
  
-               client.flags = I2C_CLIENT_TEN;
+               msg.flags = I2C_M_TEN;
        }
  
-       client.addr = params[0].u.value.c;
-       snprintf(client.name, I2C_NAME_SIZE, "i2c%d", client.adapter->nr);
+       msg.addr = params[0].u.value.c;
+       msg.buf  = params[2].u.memref.shm->kaddr;
+       msg.len  = params[2].u.memref.size;
  
        switch (params[0].u.value.a) {
 -      case OPTEE_MSG_RPC_CMD_I2C_TRANSFER_RD:
 +      case OPTEE_RPC_I2C_TRANSFER_RD:
-               ret = i2c_master_recv(&client, params[2].u.memref.shm->kaddr,
-                                     params[2].u.memref.size);
+               msg.flags |= I2C_M_RD;
                break;
 -      case OPTEE_MSG_RPC_CMD_I2C_TRANSFER_WR:
 +      case OPTEE_RPC_I2C_TRANSFER_WR:
-               ret = i2c_master_send(&client, params[2].u.memref.shm->kaddr,
-                                     params[2].u.memref.size);
                break;
        default:
-               i2c_put_adapter(client.adapter);
+               i2c_put_adapter(adapter);
                goto bad;
        }