projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MSI: Give archs the option to allocate all MSI/Xs at once.
[powerpc.git]
/
drivers
/
input
/
gameport
/
gameport.c
diff --git
a/drivers/input/gameport/gameport.c
b/drivers/input/gameport/gameport.c
index
a0af97e
..
bd686a2
100644
(file)
--- a/
drivers/input/gameport/gameport.c
+++ b/
drivers/input/gameport/gameport.c
@@
-23,6
+23,7
@@
#include <linux/kthread.h>
#include <linux/sched.h> /* HZ */
#include <linux/mutex.h>
#include <linux/kthread.h>
#include <linux/sched.h> /* HZ */
#include <linux/mutex.h>
+#include <linux/freezer.h>
/*#include <asm/io.h>*/
/*#include <asm/io.h>*/
@@
-189,16
+190,14
@@
static void gameport_run_poll_handler(unsigned long d)
* Basic gameport -> driver core mappings
*/
* Basic gameport -> driver core mappings
*/
-static
void
gameport_bind_driver(struct gameport *gameport, struct gameport_driver *drv)
+static
int
gameport_bind_driver(struct gameport *gameport, struct gameport_driver *drv)
{
int error;
{
int error;
- down_write(&gameport_bus.subsys.rwsem);
-
gameport->dev.driver = &drv->driver;
if (drv->connect(gameport, drv)) {
gameport->dev.driver = NULL;
gameport->dev.driver = &drv->driver;
if (drv->connect(gameport, drv)) {
gameport->dev.driver = NULL;
-
goto out
;
+
return -ENODEV
;
}
error = device_bind_driver(&gameport->dev);
}
error = device_bind_driver(&gameport->dev);
@@
-210,31
+209,21
@@
static void gameport_bind_driver(struct gameport *gameport, struct gameport_driv
drv->description, error);
drv->disconnect(gameport);
gameport->dev.driver = NULL;
drv->description, error);
drv->disconnect(gameport);
gameport->dev.driver = NULL;
-
goto out
;
+
return error
;
}
}
- out:
- up_write(&gameport_bus.subsys.rwsem);
-}
-
-static void gameport_release_driver(struct gameport *gameport)
-{
- down_write(&gameport_bus.subsys.rwsem);
- device_release_driver(&gameport->dev);
- up_write(&gameport_bus.subsys.rwsem);
+ return 0;
}
static void gameport_find_driver(struct gameport *gameport)
{
int error;
}
static void gameport_find_driver(struct gameport *gameport)
{
int error;
- down_write(&gameport_bus.subsys.rwsem);
error = device_attach(&gameport->dev);
if (error < 0)
printk(KERN_WARNING
"gameport: device_attach() failed for %s (%s), error: %d\n",
gameport->phys, gameport->name, error);
error = device_attach(&gameport->dev);
if (error < 0)
printk(KERN_WARNING
"gameport: device_attach() failed for %s (%s), error: %d\n",
gameport->phys, gameport->name, error);
- up_write(&gameport_bus.subsys.rwsem);
}
}
@@
-482,13
+471,12
@@
static ssize_t gameport_rebind_driver(struct device *dev, struct device_attribut
{
struct gameport *gameport = to_gameport_port(dev);
struct device_driver *drv;
{
struct gameport *gameport = to_gameport_port(dev);
struct device_driver *drv;
- int
retval
;
+ int
error
;
-
retval
= mutex_lock_interruptible(&gameport_mutex);
- if (
retval
)
- return
retval
;
+
error
= mutex_lock_interruptible(&gameport_mutex);
+ if (
error
)
+ return
error
;
- retval = count;
if (!strncmp(buf, "none", count)) {
gameport_disconnect_port(gameport);
} else if (!strncmp(buf, "reconnect", count)) {
if (!strncmp(buf, "none", count)) {
gameport_disconnect_port(gameport);
} else if (!strncmp(buf, "reconnect", count)) {
@@
-498,15
+486,15
@@
static ssize_t gameport_rebind_driver(struct device *dev, struct device_attribut
gameport_find_driver(gameport);
} else if ((drv = driver_find(buf, &gameport_bus)) != NULL) {
gameport_disconnect_port(gameport);
gameport_find_driver(gameport);
} else if ((drv = driver_find(buf, &gameport_bus)) != NULL) {
gameport_disconnect_port(gameport);
- gameport_bind_driver(gameport, to_gameport_driver(drv));
+
error =
gameport_bind_driver(gameport, to_gameport_driver(drv));
put_driver(drv);
} else {
put_driver(drv);
} else {
-
retval
= -EINVAL;
+
error
= -EINVAL;
}
mutex_unlock(&gameport_mutex);
}
mutex_unlock(&gameport_mutex);
- return
retval
;
+ return
error ? error : count
;
}
static struct device_attribute gameport_device_attrs[] = {
}
static struct device_attribute gameport_device_attrs[] = {
@@
-654,7
+642,7
@@
static void gameport_disconnect_port(struct gameport *gameport)
do {
parent = s->parent;
do {
parent = s->parent;
-
gameport_release_driver(s
);
+
device_release_driver(&s->dev
);
gameport_destroy_port(s);
} while ((s = parent) != gameport);
}
gameport_destroy_port(s);
} while ((s = parent) != gameport);
}
@@
-662,7
+650,7
@@
static void gameport_disconnect_port(struct gameport *gameport)
/*
* Ok, no children left, now disconnect this port
*/
/*
* Ok, no children left, now disconnect this port
*/
-
gameport_release_driver(gameport
);
+
device_release_driver(&gameport->dev
);
}
void gameport_rescan(struct gameport *gameport)
}
void gameport_rescan(struct gameport *gameport)
@@
-730,12
+718,6
@@
static int gameport_driver_remove(struct device *dev)
return 0;
}
return 0;
}
-static struct bus_type gameport_bus = {
- .name = "gameport",
- .probe = gameport_driver_probe,
- .remove = gameport_driver_remove,
-};
-
static void gameport_add_driver(struct gameport_driver *drv)
{
int error;
static void gameport_add_driver(struct gameport_driver *drv)
{
int error;
@@
-781,6
+763,15
@@
static int gameport_bus_match(struct device *dev, struct device_driver *drv)
return !gameport_drv->ignore;
}
return !gameport_drv->ignore;
}
+static struct bus_type gameport_bus = {
+ .name = "gameport",
+ .dev_attrs = gameport_device_attrs,
+ .drv_attrs = gameport_driver_attrs,
+ .match = gameport_bus_match,
+ .probe = gameport_driver_probe,
+ .remove = gameport_driver_remove,
+};
+
static void gameport_set_drv(struct gameport *gameport, struct gameport_driver *drv)
{
mutex_lock(&gameport->drv_mutex);
static void gameport_set_drv(struct gameport *gameport, struct gameport_driver *drv)
{
mutex_lock(&gameport->drv_mutex);
@@
-790,7
+781,6
@@
static void gameport_set_drv(struct gameport *gameport, struct gameport_driver *
int gameport_open(struct gameport *gameport, struct gameport_driver *drv, int mode)
{
int gameport_open(struct gameport *gameport, struct gameport_driver *drv, int mode)
{
-
if (gameport->open) {
if (gameport->open(gameport, mode)) {
return -1;
if (gameport->open) {
if (gameport->open(gameport, mode)) {
return -1;
@@
-818,9
+808,6
@@
static int __init gameport_init(void)
{
int error;
{
int error;
- gameport_bus.dev_attrs = gameport_device_attrs;
- gameport_bus.drv_attrs = gameport_driver_attrs;
- gameport_bus.match = gameport_bus_match;
error = bus_register(&gameport_bus);
if (error) {
printk(KERN_ERR "gameport: failed to register gameport bus, error: %d\n", error);
error = bus_register(&gameport_bus);
if (error) {
printk(KERN_ERR "gameport: failed to register gameport bus, error: %d\n", error);