Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 154adc14 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by John Stultz
Browse files

mfd: cros_ec_spi: Use ktime_get_ns() 



Replace the ever recurring:
	ts = ktime_get_ts();
	ns = timespec_to_ns(&ts);
with
	ns = ktime_get_ns();

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 9e93f21b

drivers/mfd/cros_ec_spi.c

+2 −6
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ static int cros_ec_command_spi_xfer(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_command_spi_xfer(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);

	}
@@ -280,8 +277,7 @@ static int cros_ec_command_spi_xfer(struct cros_ec_device *ec_dev, 
	}



	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) {