Commit d4d47895 authored by Leslie Klein's avatar Leslie Klein Committed by Greg Kroah-Hartman

Staging: comedi: comedi_fops: Replace 'unsigned' with 'unsigned int'

Fix checkpatch warning:
Prefer 'unsigned int' to bare use of 'unsigned'
in file comedi_fops.c
Signed-off-by: default avatarLeslie Klein <lesliebklein@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 938cae7a
...@@ -186,7 +186,7 @@ static bool comedi_clear_board_dev(struct comedi_device *dev) ...@@ -186,7 +186,7 @@ static bool comedi_clear_board_dev(struct comedi_device *dev)
return cleared; return cleared;
} }
static struct comedi_device *comedi_clear_board_minor(unsigned minor) static struct comedi_device *comedi_clear_board_minor(unsigned int minor)
{ {
struct comedi_device *dev; struct comedi_device *dev;
...@@ -210,7 +210,7 @@ static void comedi_free_board_dev(struct comedi_device *dev) ...@@ -210,7 +210,7 @@ static void comedi_free_board_dev(struct comedi_device *dev)
} }
static struct comedi_subdevice static struct comedi_subdevice
*comedi_subdevice_from_minor(const struct comedi_device *dev, unsigned minor) *comedi_subdevice_from_minor(const struct comedi_device *dev, unsigned int minor)
{ {
struct comedi_subdevice *s; struct comedi_subdevice *s;
unsigned int i = minor - COMEDI_NUM_BOARD_MINORS; unsigned int i = minor - COMEDI_NUM_BOARD_MINORS;
...@@ -223,7 +223,7 @@ static struct comedi_subdevice ...@@ -223,7 +223,7 @@ static struct comedi_subdevice
return s; return s;
} }
static struct comedi_device *comedi_dev_get_from_board_minor(unsigned minor) static struct comedi_device *comedi_dev_get_from_board_minor(unsigned int minor)
{ {
struct comedi_device *dev; struct comedi_device *dev;
...@@ -233,7 +233,7 @@ static struct comedi_device *comedi_dev_get_from_board_minor(unsigned minor) ...@@ -233,7 +233,7 @@ static struct comedi_device *comedi_dev_get_from_board_minor(unsigned minor)
return dev; return dev;
} }
static struct comedi_device *comedi_dev_get_from_subdevice_minor(unsigned minor) static struct comedi_device *comedi_dev_get_from_subdevice_minor(unsigned int minor)
{ {
struct comedi_device *dev; struct comedi_device *dev;
struct comedi_subdevice *s; struct comedi_subdevice *s;
...@@ -258,7 +258,7 @@ static struct comedi_device *comedi_dev_get_from_subdevice_minor(unsigned minor) ...@@ -258,7 +258,7 @@ static struct comedi_device *comedi_dev_get_from_subdevice_minor(unsigned minor)
* reference incremented. Return NULL if no COMEDI device exists with the * reference incremented. Return NULL if no COMEDI device exists with the
* specified minor device number. * specified minor device number.
*/ */
struct comedi_device *comedi_dev_get_from_minor(unsigned minor) struct comedi_device *comedi_dev_get_from_minor(unsigned int minor)
{ {
if (minor < COMEDI_NUM_BOARD_MINORS) if (minor < COMEDI_NUM_BOARD_MINORS)
return comedi_dev_get_from_board_minor(minor); return comedi_dev_get_from_board_minor(minor);
...@@ -342,7 +342,7 @@ static struct comedi_subdevice *comedi_file_write_subdevice(struct file *file) ...@@ -342,7 +342,7 @@ static struct comedi_subdevice *comedi_file_write_subdevice(struct file *file)
} }
static int resize_async_buffer(struct comedi_device *dev, static int resize_async_buffer(struct comedi_device *dev,
struct comedi_subdevice *s, unsigned new_size) struct comedi_subdevice *s, unsigned int new_size)
{ {
struct comedi_async *async = s->async; struct comedi_async *async = s->async;
int retval; int retval;
...@@ -616,19 +616,19 @@ static struct attribute *comedi_dev_attrs[] = { ...@@ -616,19 +616,19 @@ static struct attribute *comedi_dev_attrs[] = {
ATTRIBUTE_GROUPS(comedi_dev); ATTRIBUTE_GROUPS(comedi_dev);
static void __comedi_clear_subdevice_runflags(struct comedi_subdevice *s, static void __comedi_clear_subdevice_runflags(struct comedi_subdevice *s,
unsigned bits) unsigned int bits)
{ {
s->runflags &= ~bits; s->runflags &= ~bits;
} }
static void __comedi_set_subdevice_runflags(struct comedi_subdevice *s, static void __comedi_set_subdevice_runflags(struct comedi_subdevice *s,
unsigned bits) unsigned int bits)
{ {
s->runflags |= bits; s->runflags |= bits;
} }
static void comedi_update_subdevice_runflags(struct comedi_subdevice *s, static void comedi_update_subdevice_runflags(struct comedi_subdevice *s,
unsigned mask, unsigned bits) unsigned int mask, unsigned int bits)
{ {
unsigned long flags; unsigned long flags;
...@@ -638,15 +638,15 @@ static void comedi_update_subdevice_runflags(struct comedi_subdevice *s, ...@@ -638,15 +638,15 @@ static void comedi_update_subdevice_runflags(struct comedi_subdevice *s,
spin_unlock_irqrestore(&s->spin_lock, flags); spin_unlock_irqrestore(&s->spin_lock, flags);
} }
static unsigned __comedi_get_subdevice_runflags(struct comedi_subdevice *s) static unsigned int __comedi_get_subdevice_runflags(struct comedi_subdevice *s)
{ {
return s->runflags; return s->runflags;
} }
static unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s) static unsigned int comedi_get_subdevice_runflags(struct comedi_subdevice *s)
{ {
unsigned long flags; unsigned long flags;
unsigned runflags; unsigned int runflags;
spin_lock_irqsave(&s->spin_lock, flags); spin_lock_irqsave(&s->spin_lock, flags);
runflags = __comedi_get_subdevice_runflags(s); runflags = __comedi_get_subdevice_runflags(s);
...@@ -654,12 +654,12 @@ static unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s) ...@@ -654,12 +654,12 @@ static unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s)
return runflags; return runflags;
} }
static bool comedi_is_runflags_running(unsigned runflags) static bool comedi_is_runflags_running(unsigned int runflags)
{ {
return runflags & COMEDI_SRF_RUNNING; return runflags & COMEDI_SRF_RUNNING;
} }
static bool comedi_is_runflags_in_error(unsigned runflags) static bool comedi_is_runflags_in_error(unsigned int runflags)
{ {
return runflags & COMEDI_SRF_ERROR; return runflags & COMEDI_SRF_ERROR;
} }
...@@ -673,7 +673,7 @@ static bool comedi_is_runflags_in_error(unsigned runflags) ...@@ -673,7 +673,7 @@ static bool comedi_is_runflags_in_error(unsigned runflags)
*/ */
bool comedi_is_subdevice_running(struct comedi_subdevice *s) bool comedi_is_subdevice_running(struct comedi_subdevice *s)
{ {
unsigned runflags = comedi_get_subdevice_runflags(s); unsigned int runflags = comedi_get_subdevice_runflags(s);
return comedi_is_runflags_running(runflags); return comedi_is_runflags_running(runflags);
} }
...@@ -681,14 +681,14 @@ EXPORT_SYMBOL_GPL(comedi_is_subdevice_running); ...@@ -681,14 +681,14 @@ EXPORT_SYMBOL_GPL(comedi_is_subdevice_running);
static bool __comedi_is_subdevice_running(struct comedi_subdevice *s) static bool __comedi_is_subdevice_running(struct comedi_subdevice *s)
{ {
unsigned runflags = __comedi_get_subdevice_runflags(s); unsigned int runflags = __comedi_get_subdevice_runflags(s);
return comedi_is_runflags_running(runflags); return comedi_is_runflags_running(runflags);
} }
bool comedi_can_auto_free_spriv(struct comedi_subdevice *s) bool comedi_can_auto_free_spriv(struct comedi_subdevice *s)
{ {
unsigned runflags = __comedi_get_subdevice_runflags(s); unsigned int runflags = __comedi_get_subdevice_runflags(s);
return runflags & COMEDI_SRF_FREE_SPRIV; return runflags & COMEDI_SRF_FREE_SPRIV;
} }
...@@ -2038,7 +2038,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg, ...@@ -2038,7 +2038,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd, static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
unsigned minor = iminor(file_inode(file)); unsigned int minor = iminor(file_inode(file));
struct comedi_file *cfp = file->private_data; struct comedi_file *cfp = file->private_data;
struct comedi_device *dev = cfp->dev; struct comedi_device *dev = cfp->dev;
int rc; int rc;
...@@ -2342,7 +2342,7 @@ static ssize_t comedi_write(struct file *file, const char __user *buf, ...@@ -2342,7 +2342,7 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
add_wait_queue(&async->wait_head, &wait); add_wait_queue(&async->wait_head, &wait);
while (count == 0 && !retval) { while (count == 0 && !retval) {
unsigned runflags; unsigned int runflags;
unsigned int wp, n1, n2; unsigned int wp, n1, n2;
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
...@@ -2485,7 +2485,7 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes, ...@@ -2485,7 +2485,7 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
n = min_t(size_t, m, nbytes); n = min_t(size_t, m, nbytes);
if (n == 0) { if (n == 0) {
unsigned runflags = comedi_get_subdevice_runflags(s); unsigned int runflags = comedi_get_subdevice_runflags(s);
if (!comedi_is_runflags_running(runflags)) { if (!comedi_is_runflags_running(runflags)) {
if (comedi_is_runflags_in_error(runflags)) if (comedi_is_runflags_in_error(runflags))
...@@ -2573,7 +2573,7 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes, ...@@ -2573,7 +2573,7 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
static int comedi_open(struct inode *inode, struct file *file) static int comedi_open(struct inode *inode, struct file *file)
{ {
const unsigned minor = iminor(inode); const unsigned int minor = iminor(inode);
struct comedi_file *cfp; struct comedi_file *cfp;
struct comedi_device *dev = comedi_dev_get_from_minor(minor); struct comedi_device *dev = comedi_dev_get_from_minor(minor);
int rc; int rc;
...@@ -2733,7 +2733,7 @@ struct comedi_device *comedi_alloc_board_minor(struct device *hardware_device) ...@@ -2733,7 +2733,7 @@ struct comedi_device *comedi_alloc_board_minor(struct device *hardware_device)
{ {
struct comedi_device *dev; struct comedi_device *dev;
struct device *csdev; struct device *csdev;
unsigned i; unsigned int i;
dev = kzalloc(sizeof(*dev), GFP_KERNEL); dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!dev) if (!dev)
...@@ -2791,7 +2791,7 @@ int comedi_alloc_subdevice_minor(struct comedi_subdevice *s) ...@@ -2791,7 +2791,7 @@ int comedi_alloc_subdevice_minor(struct comedi_subdevice *s)
{ {
struct comedi_device *dev = s->device; struct comedi_device *dev = s->device;
struct device *csdev; struct device *csdev;
unsigned i; unsigned int i;
mutex_lock(&comedi_subdevice_minor_table_lock); mutex_lock(&comedi_subdevice_minor_table_lock);
for (i = 0; i < COMEDI_NUM_SUBDEVICE_MINORS; ++i) { for (i = 0; i < COMEDI_NUM_SUBDEVICE_MINORS; ++i) {
...@@ -2841,7 +2841,7 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s) ...@@ -2841,7 +2841,7 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s)
static void comedi_cleanup_board_minors(void) static void comedi_cleanup_board_minors(void)
{ {
struct comedi_device *dev; struct comedi_device *dev;
unsigned i; unsigned int i;
for (i = 0; i < COMEDI_NUM_BOARD_MINORS; i++) { for (i = 0; i < COMEDI_NUM_BOARD_MINORS; i++) {
dev = comedi_clear_board_minor(i); dev = comedi_clear_board_minor(i);
......
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