Merge tag 'chrome-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform

Pull chrome platform updates from Olof Johansson:
 "Here's a set of updates to the Chrome OS platform drivers for this
  merge window.

  Main new things this cycle is:

   - Driver changes to expose the lightbar to users.  With this, you can
     make your own blinkenlights on Chromebook Pixels.

   - Changes in the way that the atmel_mxt trackpads are probed.  The
     laptop driver is trying to be smart and not instantiate the devices
     that don't answer to probe.  For the trackpad that can come up in
     two modes (bootloader or regular), this gets complicated since the
     driver already knows how to handle the two modes including the
     actual addresses used.  So now the laptop driver needs to know more
     too, instantiating the regular address even if the bootloader one
     is the probe that passed.

   - mfd driver improvements by Javier Martines Canillas, and a few
     bugfixes from him, kbuild and myself"

* tag 'chrome-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform:
  platform/chrome: chromeos_laptop - instantiate Atmel at primary address
  platform/chrome: cros_ec_lpc - Depend on X86 || COMPILE_TEST
  platform/chrome: cros_ec_lpc - Include linux/io.h header file
  platform/chrome: fix platform_no_drv_owner.cocci warnings
  platform/chrome: cros_ec_lightbar - fix duplicate const warning
  platform/chrome: cros_ec_dev - fix Unknown escape '%' warning
  platform/chrome: Expose Chrome OS Lightbar to users
  platform/chrome: Create sysfs attributes for the ChromeOS EC
  mfd: cros_ec: Instantiate ChromeOS EC character device
  platform/chrome: Add Chrome OS EC userspace device interface
  platform/chrome: Add cros_ec_lpc driver for x86 devices
  mfd: cros_ec: Add char dev and virtual dev pointers
  mfd: cros_ec: Use fixed size arrays to transfer data with the EC

1 files changed, 10 insertions, 41 deletions

diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c
index 875c22ae5400..fa8dedd8c3a2 100644
--- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c
+++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c
@@ -182,72 +182,41 @@ static int ec_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg i2c_msgs[],
         const u16 bus_num = bus->remote_bus;
         int request_len;
         int response_len;
-        u8 *request = NULL;
-        u8 *response = NULL;
         int result;
-        struct cros_ec_command msg;
+        struct cros_ec_command msg = { };
 
         request_len = ec_i2c_count_message(i2c_msgs, num);
         if (request_len < 0) {
                 dev_warn(dev, "Error constructing message %d\n", request_len);
-                result = request_len;
-                goto exit;
+                return request_len;
         }
+
         response_len = ec_i2c_count_response(i2c_msgs, num);
         if (response_len < 0) {
                 /* Unexpected; no errors should come when NULL response */
                 dev_warn(dev, "Error preparing response %d\n", response_len);
-                result = response_len;
-                goto exit;
-        }
-
-        if (request_len <= ARRAY_SIZE(bus->request_buf)) {
-                request = bus->request_buf;
-        } else {
-                request = kzalloc(request_len, GFP_KERNEL);
-                if (request == NULL) {
-                        result = -ENOMEM;
-                        goto exit;
-                }
-        }
-        if (response_len <= ARRAY_SIZE(bus->response_buf)) {
-                response = bus->response_buf;
-        } else {
-                response = kzalloc(response_len, GFP_KERNEL);
-                if (response == NULL) {
-                        result = -ENOMEM;
-                        goto exit;
-                }
+                return response_len;
         }
 
-        result = ec_i2c_construct_message(request, i2c_msgs, num, bus_num);
+        result = ec_i2c_construct_message(msg.outdata, i2c_msgs, num, bus_num);
         if (result)
-                goto exit;
+                return result;
 
         msg.version = 0;
         msg.command = EC_CMD_I2C_PASSTHRU;
-        msg.outdata = request;
         msg.outsize = request_len;
-        msg.indata = response;
         msg.insize = response_len;
 
         result = cros_ec_cmd_xfer(bus->ec, &msg);
         if (result < 0)
-                goto exit;
+                return result;
 
-        result = ec_i2c_parse_response(response, i2c_msgs, &num);
+        result = ec_i2c_parse_response(msg.indata, i2c_msgs, &num);
         if (result < 0)
-                goto exit;
+                return result;
 
         /* Indicate success by saying how many messages were sent */
-        result = num;
-exit:
-        if (request != bus->request_buf)
-                kfree(request);
-        if (response != bus->response_buf)
-                kfree(response);
-
-        return result;
+        return num;
 }
 
 static u32 ec_i2c_functionality(struct i2c_adapter *adap)