unregister_chrdev() return void
unregister_chrdev() does not return meaningful value. This patch makes it return void like most unregister_* functions. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
68fc4fabca
commit
e53252d97e
@@ -321,14 +321,13 @@ void unregister_chrdev_region(dev_t from, unsigned count)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int unregister_chrdev(unsigned int major, const char *name)
|
void unregister_chrdev(unsigned int major, const char *name)
|
||||||
{
|
{
|
||||||
struct char_device_struct *cd;
|
struct char_device_struct *cd;
|
||||||
cd = __unregister_chrdev_region(major, 0, 256);
|
cd = __unregister_chrdev_region(major, 0, 256);
|
||||||
if (cd && cd->cdev)
|
if (cd && cd->cdev)
|
||||||
cdev_del(cd->cdev);
|
cdev_del(cd->cdev);
|
||||||
kfree(cd);
|
kfree(cd);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_SPINLOCK(cdev_lock);
|
static DEFINE_SPINLOCK(cdev_lock);
|
||||||
|
@@ -1463,7 +1463,7 @@ extern int alloc_chrdev_region(dev_t *, unsigned, unsigned, const char *);
|
|||||||
extern int register_chrdev_region(dev_t, unsigned, const char *);
|
extern int register_chrdev_region(dev_t, unsigned, const char *);
|
||||||
extern int register_chrdev(unsigned int, const char *,
|
extern int register_chrdev(unsigned int, const char *,
|
||||||
const struct file_operations *);
|
const struct file_operations *);
|
||||||
extern int unregister_chrdev(unsigned int, const char *);
|
extern void unregister_chrdev(unsigned int, const char *);
|
||||||
extern void unregister_chrdev_region(dev_t, unsigned);
|
extern void unregister_chrdev_region(dev_t, unsigned);
|
||||||
extern int chrdev_open(struct inode *, struct file *);
|
extern int chrdev_open(struct inode *, struct file *);
|
||||||
extern void chrdev_show(struct seq_file *,off_t);
|
extern void chrdev_show(struct seq_file *,off_t);
|
||||||
|
Reference in New Issue
Block a user