projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ROSE]: Remove useless prototype for rose_remove_neigh().
[powerpc.git]
/
drivers
/
input
/
mousedev.c
diff --git
a/drivers/input/mousedev.c
b/drivers/input/mousedev.c
index
81fd7a9
..
b685a50
100644
(file)
--- a/
drivers/input/mousedev.c
+++ b/
drivers/input/mousedev.c
@@
-356,7
+356,7
@@
static void mousedev_free(struct mousedev *mousedev)
kfree(mousedev);
}
kfree(mousedev);
}
-static
int
mixdev_release(void)
+static
void
mixdev_release(void)
{
struct input_handle *handle;
{
struct input_handle *handle;
@@
-370,8
+370,6
@@
static int mixdev_release(void)
mousedev_free(mousedev);
}
}
mousedev_free(mousedev);
}
}
-
- return 0;
}
static int mousedev_release(struct inode * inode, struct file * file)
}
static int mousedev_release(struct inode * inode, struct file * file)
@@
-384,9
+382,8
@@
static int mousedev_release(struct inode * inode, struct file * file)
if (!--list->mousedev->open) {
if (list->mousedev->minor == MOUSEDEV_MIX)
if (!--list->mousedev->open) {
if (list->mousedev->minor == MOUSEDEV_MIX)
- return mixdev_release();
-
- if (!mousedev_mix.open) {
+ mixdev_release();
+ else if (!mousedev_mix.open) {
if (list->mousedev->exist)
input_close_device(&list->mousedev->handle);
else
if (list->mousedev->exist)
input_close_device(&list->mousedev->handle);
else
@@
-415,9
+412,8
@@
static int mousedev_open(struct inode * inode, struct file * file)
if (i >= MOUSEDEV_MINORS || !mousedev_table[i])
return -ENODEV;
if (i >= MOUSEDEV_MINORS || !mousedev_table[i])
return -ENODEV;
- if (!(list = k
m
alloc(sizeof(struct mousedev_list), GFP_KERNEL)))
+ if (!(list = k
z
alloc(sizeof(struct mousedev_list), GFP_KERNEL)))
return -ENOMEM;
return -ENOMEM;
- memset(list, 0, sizeof(struct mousedev_list));
spin_lock_init(&list->packet_lock);
list->pos_x = xres / 2;
spin_lock_init(&list->packet_lock);
list->pos_x = xres / 2;
@@
-629,9
+625,8
@@
static struct input_handle *mousedev_connect(struct input_handler *handler, stru
return NULL;
}
return NULL;
}
- if (!(mousedev = k
m
alloc(sizeof(struct mousedev), GFP_KERNEL)))
+ if (!(mousedev = k
z
alloc(sizeof(struct mousedev), GFP_KERNEL)))
return NULL;
return NULL;
- memset(mousedev, 0, sizeof(struct mousedev));
INIT_LIST_HEAD(&mousedev->list);
init_waitqueue_head(&mousedev->wait);
INIT_LIST_HEAD(&mousedev->list);
init_waitqueue_head(&mousedev->wait);