From 51625dea8d8ff4c2b92350950dbe2c6bc81c9a67 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 5 Jan 2006 14:38:53 +0000 Subject: [PATCH] --- yaml --- r: 18387 b: refs/heads/master c: 30226f8199cb7f5ace767f65bcebb85941612dfc h: refs/heads/master i: 18385: 8c130a07ab610a512c52e5be97a69e69f70dfb82 18383: 8bf41aa47d080abf4835ebec004b0bc7d01e24f7 v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/serio.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f00d298d32ac..288b20ab1eb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29a4a20e9fe7459f9d464b8be070ce8b7335be7e +refs/heads/master: 30226f8199cb7f5ace767f65bcebb85941612dfc diff --git a/trunk/drivers/input/serio/serio.c b/trunk/drivers/input/serio/serio.c index 8e530cc970e1..2f76813c3a64 100644 --- a/trunk/drivers/input/serio/serio.c +++ b/trunk/drivers/input/serio/serio.c @@ -59,9 +59,7 @@ static DECLARE_MUTEX(serio_sem); static LIST_HEAD(serio_list); -static struct bus_type serio_bus = { - .name = "serio", -}; +static struct bus_type serio_bus; static void serio_add_port(struct serio *serio); static void serio_destroy_port(struct serio *serio); @@ -750,11 +748,15 @@ static int serio_driver_remove(struct device *dev) return 0; } +static struct bus_type serio_bus = { + .name = "serio", + .probe = serio_driver_probe, + .remove = serio_driver_remove, +}; + void __serio_register_driver(struct serio_driver *drv, struct module *owner) { drv->driver.bus = &serio_bus; - drv->driver.probe = serio_driver_probe; - drv->driver.remove = serio_driver_remove; serio_queue_event(drv, owner, SERIO_REGISTER_DRIVER); }