staging: comedi: ni_660x: Prefer kernel type 'u64' over 'uint64_t' (cded944f) · Commits · 戴 / test

drivers/staging/comedi/drivers/ni_660x.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -331,7 +331,7 @@ static const struct ni_660x_board ni_660x_boards[] = {
	struct ni_660x_private {		struct ni_660x_private {
	struct mite_struct *mite;		struct mite_struct *mite;
	struct ni_gpct_device *counter_dev;		struct ni_gpct_device *counter_dev;
	uint64_t pfi_direction_bits;		u64 pfi_direction_bits;
	struct mite_dma_descriptor_ring		struct mite_dma_descriptor_ring
	*mite_rings[NI_660X_MAX_NUM_CHIPS][counters_per_chip];		*mite_rings[NI_660X_MAX_NUM_CHIPS][counters_per_chip];
	spinlock_t mite_channel_lock;		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;		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,		ni_660x_select_pfi_output(dev, chan,
	devpriv->pfi_output_selects[chan]);		devpriv->pfi_output_selects[chan]);
	return 0;		return 0;
	@@ -867,7 +867,7 @@ static int ni_660x_dio_insn_config(struct comedi_device *dev,
	{		{
	struct ni_660x_private *devpriv = dev->private;		struct ni_660x_private *devpriv = dev->private;
	unsigned int chan = CR_CHAN(insn->chanspec);		unsigned int chan = CR_CHAN(insn->chanspec);
	uint64_t bit = 1ULL << chan;		u64 bit = 1ULL << chan;
	unsigned int val;		unsigned int val;
	int ret;		int ret;