projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-block.git]
/
drivers
/
staging
/
vme
/
devices
/
vme_user.c
diff --git
a/drivers/staging/vme/devices/vme_user.c
b/drivers/staging/vme/devices/vme_user.c
index 568698fc3d3fdcce24016ea3846acae7f17cb079..e3fa38bd7f12469af8ff09b091c126d0de14768a 100644
(file)
--- a/
drivers/staging/vme/devices/vme_user.c
+++ b/
drivers/staging/vme/devices/vme_user.c
@@
-689,7
+689,7
@@
err_dev:
return err;
}
return err;
}
-static
int
vme_user_remove(struct vme_dev *dev)
+static
void
vme_user_remove(struct vme_dev *dev)
{
int i;
{
int i;
@@
-717,8
+717,6
@@
static int vme_user_remove(struct vme_dev *dev)
/* Unregister the major and minor device numbers */
unregister_chrdev_region(MKDEV(VME_MAJOR, 0), VME_DEVS);
/* Unregister the major and minor device numbers */
unregister_chrdev_region(MKDEV(VME_MAJOR, 0), VME_DEVS);
-
- return 0;
}
static struct vme_driver vme_user_driver = {
}
static struct vme_driver vme_user_driver = {