Merge tag 'mfd-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[linux-2.6-block.git] / drivers / mfd / cros_ec_spi.c

diff --git a/drivers/mfd/cros_ec_spi.c b/drivers/mfd/cros_ec_spi.c
index ac52e3653e90395d9fb9a0d51c975cad33526ef4..588c700af39c17882fb4c8b5af9131d195427c5e 100644 (file)
--- a/drivers/mfd/cros_ec_spi.c
+++ b/drivers/mfd/cros_ec_spi.c
@@ -225,7 +225,6 @@ static int cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev,
        u8 *ptr;
        int sum;
        int ret = 0, final_ret;
-       struct timespec ts;
 
        /*
         * We have the shared ec_dev buffer plus we do lots of separate spi_sync
@@ -239,11 +238,9 @@ static int cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev,
 
        /* If it's too soon to do another transaction, wait */
        if (ec_spi->last_transfer_ns) {
-               struct timespec ts;
                unsigned long delay;    /* The delay completed so far */
 
-               ktime_get_ts(&ts);
-               delay = timespec_to_ns(&ts) - ec_spi->last_transfer_ns;
+               delay = ktime_get_ns() - ec_spi->last_transfer_ns;
                if (delay < EC_SPI_RECOVERY_TIME_NS)
                        ndelay(EC_SPI_RECOVERY_TIME_NS - delay);
        }
@@ -276,8 +273,7 @@ static int cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev,
        spi_message_add_tail(&trans, &msg);
 
        final_ret = spi_sync(ec_spi->spi, &msg);
-       ktime_get_ts(&ts);
-       ec_spi->last_transfer_ns = timespec_to_ns(&ts);
+       ec_spi->last_transfer_ns = ktime_get_ns();
        if (!ret)
                ret = final_ret;
        if (ret < 0) {