summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/ni_660x.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2016-03-22 11:10:30 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-28 07:30:36 -0700
commitcded944fa90cf8105eedb5766ecaee82a2f86b3a (patch)
tree9eeea36bbb31d46d759bb1776428060a52b4d14c /drivers/staging/comedi/drivers/ni_660x.c
parent2225320ec8cc7f99c05ff217343eb63d5319c314 (diff)
staging: comedi: ni_660x: Prefer kernel type 'u64' over 'uint64_t'
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_660x.c')
-rw-r--r--drivers/staging/comedi/drivers/ni_660x.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 6ca5c67b1a80..4f7f5ca01e97 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -331,7 +331,7 @@ static const struct ni_660x_board ni_660x_boards[] = {
struct ni_660x_private {
struct mite_struct *mite;
struct ni_gpct_device *counter_dev;
- uint64_t pfi_direction_bits;
+ u64 pfi_direction_bits;
struct mite_dma_descriptor_ring
*mite_rings[NI_660X_MAX_NUM_CHIPS][counters_per_chip];
spinlock_t mite_channel_lock;
@@ -854,7 +854,7 @@ static int ni_660x_set_pfi_routing(struct comedi_device *dev,
}
devpriv->pfi_output_selects[chan] = source;
- if (devpriv->pfi_direction_bits & (((uint64_t) 1) << chan))
+ if (devpriv->pfi_direction_bits & (1ULL << chan))
ni_660x_select_pfi_output(dev, chan,
devpriv->pfi_output_selects[chan]);
return 0;
@@ -867,7 +867,7 @@ static int ni_660x_dio_insn_config(struct comedi_device *dev,
{
struct ni_660x_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec);
- uint64_t bit = 1ULL << chan;
+ u64 bit = 1ULL << chan;
unsigned int val;
int ret;