Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 63427530fa7a78b42a19f47fb0c12b303c0666ca

Authored by Andrew Bresticker
Committed by Lee Jones
1 parent a6551a76ff
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

mfd: cros_ec: move locking into cros_ec_cmd_xfer 

Now that there's a central cros_ec_cmd_xfer(), move the locking
out of the SPI driver.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

Showing 2 changed files with 9 additions and 12 deletions Side-by-side Diff

drivers/mfd/cros_ec.c
Diff comments   View file @ 6342753
... ... @@ -65,7 +65,13 @@
65 65 int cros_ec_cmd_xfer(struct cros_ec_device *ec_dev,
66 66 struct cros_ec_command *msg)
67 67 {
68   - return ec_dev->cmd_xfer(ec_dev, msg);
  68 + int ret;
  69 +
  70 + mutex_lock(&ec_dev->lock);
  71 + ret = ec_dev->cmd_xfer(ec_dev, msg);
  72 + mutex_unlock(&ec_dev->lock);
  73 +
  74 + return ret;
69 75 }
70 76 EXPORT_SYMBOL(cros_ec_cmd_xfer);
71 77  
... ... @@ -97,6 +103,8 @@
97 103 if (!ec_dev->dout)
98 104 return -ENOMEM;
99 105 }
  106 +
  107 + mutex_init(&ec_dev->lock);
100 108  
101 109 err = mfd_add_devices(dev, 0, cros_devs,
102 110 ARRAY_SIZE(cros_devs),
drivers/mfd/cros_ec_spi.c
Diff comments   View file @ 6342753
... ... @@ -79,13 +79,11 @@
79 79 * if no record
80 80 * @end_of_msg_delay: used to set the delay_usecs on the spi_transfer that
81 81 * is sent when we want to turn off CS at the end of a transaction.
82   - * @lock: mutex to ensure only one user of cros_ec_cmd_xfer_spi at a time
83 82 */
84 83 struct cros_ec_spi {
85 84 struct spi_device *spi;
86 85 s64 last_transfer_ns;
87 86 unsigned int end_of_msg_delay;
88   - struct mutex lock;
89 87 };
90 88  
91 89 static void debug_packet(struct device *dev, const char *name, u8 *ptr,
... ... @@ -232,13 +230,6 @@
232 230 int sum;
233 231 int ret = 0, final_ret;
234 232  
235   - /*
236   - * We have the shared ec_dev buffer plus we do lots of separate spi_sync
237   - * calls, so we need to make sure only one person is using this at a
238   - * time.
239   - */
240   - mutex_lock(&ec_spi->lock);
241   -
242 233 len = cros_ec_prepare_tx(ec_dev, ec_msg);
243 234 dev_dbg(ec_dev->dev, "prepared, len=%d\n", len);
244 235  
... ... @@ -327,7 +318,6 @@
327 318 if (ec_msg->command == EC_CMD_REBOOT_EC)
328 319 msleep(EC_REBOOT_DELAY_MS);
329 320  
330   - mutex_unlock(&ec_spi->lock);
331 321 return ret;
332 322 }
333 323  
... ... @@ -359,7 +349,6 @@
359 349 if (ec_spi == NULL)
360 350 return -ENOMEM;
361 351 ec_spi->spi = spi;
362   - mutex_init(&ec_spi->lock);
363 352 ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL);
364 353 if (!ec_dev)
365 354 return -ENOMEM;