]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: ni_tio: Prefer kernel type 'u64' over 'uint64_t'
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 23 Mar 2016 22:36:51 +0000 (15:36 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Mar 2016 14:30:36 +0000 (07:30 -0700)
Fix the checkpatch.pl issues.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_tio.c

index ecf85270c264bb57ea0cd353b0c66f995bccc27d..e4fd22123ef0758d0f401ec55046e7101c4ad6d5 100644 (file)
@@ -213,10 +213,10 @@ static void ni_tio_reset_count_and_disarm(struct ni_gpct *counter)
        ni_tio_write(counter, GI_RESET(cidx), NITIO_RESET_REG(cidx));
 }
 
-static uint64_t ni_tio_clock_period_ps(const struct ni_gpct *counter,
-                                      unsigned int generic_clock_source)
+static u64 ni_tio_clock_period_ps(const struct ni_gpct *counter,
+                                 unsigned int generic_clock_source)
 {
-       uint64_t clock_period_ps;
+       u64 clock_period_ps;
 
        switch (generic_clock_source & NI_GPCT_CLOCK_SRC_SELECT_MASK) {
        case NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS:
@@ -474,9 +474,9 @@ static void ni_tio_set_sync_mode(struct ni_gpct *counter, int force_alt_sync)
        struct ni_gpct_device *counter_dev = counter->counter_dev;
        unsigned int cidx = counter->counter_index;
        unsigned int counting_mode_reg = NITIO_CNT_MODE_REG(cidx);
-       static const uint64_t min_normal_sync_period_ps = 25000;
+       static const u64 min_normal_sync_period_ps = 25000;
        unsigned int mode;
-       uint64_t clock_period_ps;
+       u64 clock_period_ps;
 
        if (!ni_tio_counting_mode_registers_present(counter_dev))
                return;
@@ -819,7 +819,7 @@ static void ni_tio_get_clock_src(struct ni_gpct *counter,
                                 unsigned int *clock_source,
                                 unsigned int *period_ns)
 {
-       uint64_t temp64;
+       u64 temp64;
 
        *clock_source = ni_tio_generic_clock_src_select(counter);
        temp64 = ni_tio_clock_period_ps(counter, *clock_source);