lkml.org 
[lkml]   [2014]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 36/55] misc: ioc4: 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: Thomas Gleixner <tglx@linutronix.de>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/misc/ioc4.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    Index: tip/drivers/misc/ioc4.c
    ===================================================================
    --- tip.orig/drivers/misc/ioc4.c
    +++ tip/drivers/misc/ioc4.c
    @@ -145,7 +145,6 @@ ioc4_clock_calibrate(struct ioc4_driver_
    union ioc4_int_out int_out;
    union ioc4_gpcr gpcr;
    unsigned int state, last_state = 1;
    - struct timespec start_ts, end_ts;
    uint64_t start, end, period;
    unsigned int count = 0;

    @@ -174,10 +173,10 @@ ioc4_clock_calibrate(struct ioc4_driver_
    if (!last_state && state) {
    count++;
    if (count == IOC4_CALIBRATE_END) {
    - ktime_get_ts(&end_ts);
    + end = ktime_get_ns();
    break;
    } else if (count == IOC4_CALIBRATE_DISCARD)
    - ktime_get_ts(&start_ts);
    + start = ktime_get_ns();
    }
    last_state = state;
    } while (1);
    @@ -192,8 +191,6 @@ ioc4_clock_calibrate(struct ioc4_driver_
    * by which the IOC4 generates the square wave, to get the
    * period of an IOC4 INT_OUT count.
    */
    - end = end_ts.tv_sec * NSEC_PER_SEC + end_ts.tv_nsec;
    - start = start_ts.tv_sec * NSEC_PER_SEC + start_ts.tv_nsec;
    period = (end - start) /
    (IOC4_CALIBRATE_CYCLES * 2 * (IOC4_CALIBRATE_COUNT + 1));




    \
     
     \ /
      Last update: 2014-07-12 14:21    [W:4.389 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site