Commit 9f62bee5 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_tiocmd: Prefer 'unsigned int' to bare use of 'unsigned'

Fix the checkpatch.pl issues.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3f7bb25
...@@ -51,9 +51,9 @@ static void ni_tio_configure_dma(struct ni_gpct *counter, ...@@ -51,9 +51,9 @@ static void ni_tio_configure_dma(struct ni_gpct *counter,
bool enable, bool read) bool enable, bool read)
{ {
struct ni_gpct_device *counter_dev = counter->counter_dev; struct ni_gpct_device *counter_dev = counter->counter_dev;
unsigned cidx = counter->counter_index; unsigned int cidx = counter->counter_index;
unsigned mask; unsigned int mask;
unsigned bits; unsigned int bits;
mask = GI_READ_ACKS_IRQ | GI_WRITE_ACKS_IRQ; mask = GI_READ_ACKS_IRQ | GI_WRITE_ACKS_IRQ;
bits = 0; bits = 0;
...@@ -113,7 +113,7 @@ static int ni_tio_input_cmd(struct comedi_subdevice *s) ...@@ -113,7 +113,7 @@ static int ni_tio_input_cmd(struct comedi_subdevice *s)
{ {
struct ni_gpct *counter = s->private; struct ni_gpct *counter = s->private;
struct ni_gpct_device *counter_dev = counter->counter_dev; struct ni_gpct_device *counter_dev = counter->counter_dev;
unsigned cidx = counter->counter_index; unsigned int cidx = counter->counter_index;
struct comedi_async *async = s->async; struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd; struct comedi_cmd *cmd = &async->cmd;
int ret = 0; int ret = 0;
...@@ -163,9 +163,9 @@ static int ni_tio_cmd_setup(struct comedi_subdevice *s) ...@@ -163,9 +163,9 @@ static int ni_tio_cmd_setup(struct comedi_subdevice *s)
{ {
struct comedi_cmd *cmd = &s->async->cmd; struct comedi_cmd *cmd = &s->async->cmd;
struct ni_gpct *counter = s->private; struct ni_gpct *counter = s->private;
unsigned cidx = counter->counter_index; unsigned int cidx = counter->counter_index;
int set_gate_source = 0; int set_gate_source = 0;
unsigned gate_source; unsigned int gate_source;
int retval = 0; int retval = 0;
if (cmd->scan_begin_src == TRIG_EXT) { if (cmd->scan_begin_src == TRIG_EXT) {
...@@ -289,7 +289,7 @@ EXPORT_SYMBOL_GPL(ni_tio_cmdtest); ...@@ -289,7 +289,7 @@ EXPORT_SYMBOL_GPL(ni_tio_cmdtest);
int ni_tio_cancel(struct ni_gpct *counter) int ni_tio_cancel(struct ni_gpct *counter)
{ {
unsigned cidx = counter->counter_index; unsigned int cidx = counter->counter_index;
unsigned long flags; unsigned long flags;
ni_tio_arm(counter, false, 0); ni_tio_arm(counter, false, 0);
...@@ -341,12 +341,12 @@ static void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, ...@@ -341,12 +341,12 @@ static void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter,
int *perm_stale_data, int *perm_stale_data,
int *stale_data) int *stale_data)
{ {
unsigned cidx = counter->counter_index; unsigned int cidx = counter->counter_index;
const unsigned short gxx_status = ni_tio_read(counter, const unsigned short gxx_status = ni_tio_read(counter,
NITIO_SHARED_STATUS_REG(cidx)); NITIO_SHARED_STATUS_REG(cidx));
const unsigned short gi_status = ni_tio_read(counter, const unsigned short gi_status = ni_tio_read(counter,
NITIO_STATUS_REG(cidx)); NITIO_STATUS_REG(cidx));
unsigned ack = 0; unsigned int ack = 0;
if (gate_error) if (gate_error)
*gate_error = 0; *gate_error = 0;
...@@ -407,8 +407,8 @@ EXPORT_SYMBOL_GPL(ni_tio_acknowledge); ...@@ -407,8 +407,8 @@ EXPORT_SYMBOL_GPL(ni_tio_acknowledge);
void ni_tio_handle_interrupt(struct ni_gpct *counter, void ni_tio_handle_interrupt(struct ni_gpct *counter,
struct comedi_subdevice *s) struct comedi_subdevice *s)
{ {
unsigned cidx = counter->counter_index; unsigned int cidx = counter->counter_index;
unsigned gpct_mite_status; unsigned int gpct_mite_status;
unsigned long flags; unsigned long flags;
int gate_error; int gate_error;
int tc_error; int tc_error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment