From c5712bfaaa32c0594bd7162d87ff3b6ebd334a06 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Thu, 19 Jul 2007 01:47:51 -0700 Subject: [PATCH] --- yaml --- r: 61559 b: refs/heads/master c: e53252d97e670a38b1d2e9723b48077bba11ddda h: refs/heads/master i: 61557: 3c6d65f64bc88397419e1ddfbab6388ea62efa18 61555: 5133b50ac6ac65182b13e7c07bf6b53def207f0f 61551: 94823edf3317a8a6e8f15559f0d9e1981546a77f v: v3 --- [refs] | 2 +- trunk/fs/char_dev.c | 3 +-- trunk/include/linux/fs.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 72318c365739..650c1d7cd98c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68fc4fabca897a09f75f53bac14cdc7a98f52210 +refs/heads/master: e53252d97e670a38b1d2e9723b48077bba11ddda diff --git a/trunk/fs/char_dev.c b/trunk/fs/char_dev.c index 164a45cdaf5f..bbbf07baa145 100644 --- a/trunk/fs/char_dev.c +++ b/trunk/fs/char_dev.c @@ -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; cd = __unregister_chrdev_region(major, 0, 256); if (cd && cd->cdev) cdev_del(cd->cdev); kfree(cd); - return 0; } static DEFINE_SPINLOCK(cdev_lock); diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 9562a59b3703..75dd16efc9b6 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -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(unsigned int, const char *, 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 int chrdev_open(struct inode *, struct file *); extern void chrdev_show(struct seq_file *,off_t);