ALSA: hda - Fix typos in snd_hda_get_int_hint() kerneldoc comments

[mirror_ubuntu-bionic-kernel.git] / sound / pci / es1968.c

diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index a9956a7c567708a45a1819fe4092108a2361778b..6039700f8579cfbd97c2e9d80c767fc4a2a23b2f 100644 (file)
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -1710,7 +1710,8 @@ static void es1968_measure_clock(struct es1968 *chip)
        int i, apu;
        unsigned int pa, offset, t;
        struct esm_memory *memory;
-       struct timeval start_time, stop_time;
+       ktime_t start_time, stop_time;
+       ktime_t diff;
 
        if (chip->clock == 0)
                chip->clock = 48000; /* default clock value */
@@ -1761,12 +1762,12 @@ static void es1968_measure_clock(struct es1968 *chip)
        snd_es1968_bob_inc(chip, ESM_BOB_FREQ);
        __apu_set_register(chip, apu, 5, pa & 0xffff);
        snd_es1968_trigger_apu(chip, apu, ESM_APU_16BITLINEAR);
-       do_gettimeofday(&start_time);
+       start_time = ktime_get();
        spin_unlock_irq(&chip->reg_lock);
        msleep(50);
        spin_lock_irq(&chip->reg_lock);
        offset = __apu_get_register(chip, apu, 5);
-       do_gettimeofday(&stop_time);
+       stop_time = ktime_get();
        snd_es1968_trigger_apu(chip, apu, 0); /* stop */
        snd_es1968_bob_dec(chip);
        chip->in_measurement = 0;
@@ -1777,12 +1778,8 @@ static void es1968_measure_clock(struct es1968 *chip)
        offset &= 0xfffe;
        offset += chip->measure_count * (CLOCK_MEASURE_BUFSIZE/2);
 
-       t = stop_time.tv_sec - start_time.tv_sec;
-       t *= 1000000;
-       if (stop_time.tv_usec < start_time.tv_usec)
-               t -= start_time.tv_usec - stop_time.tv_usec;
-       else
-               t += stop_time.tv_usec - start_time.tv_usec;
+       diff = ktime_sub(stop_time, start_time);
+       t = ktime_to_us(diff);
        if (t == 0) {
                dev_err(chip->card->dev, "?? calculation error..\n");
        } else {