From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [patch 1/6] xenbus cleanup Date: Thu, 17 Aug 2006 15:40:52 +0200 Message-ID: <44E471E4.7010001@suse.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060802070109020504050800" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Xen devel list List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------060802070109020504050800 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi, The patch below has some xenbus cleanups. Changes: * move function prototypes to the top of the file. * uses the "struct bus_type" function pointers instead of overwriting the "struct device_driver" ones for xenbus_dev_probe() and xenbus_dev_remove(). please apply, Gerd -- Gerd Hoffmann http://www.suse.de/~kraxel/julika-dora.jpeg --------------060802070109020504050800 Content-Type: text/plain; name="xenbus-cleanup" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xenbus-cleanup" Signed-off-by: Gerd Hoffmann Index: source-lnx-stable-22813/drivers/xen/xenbus/xenbus_probe.c =================================================================== --- source-lnx-stable-22813.orig/drivers/xen/xenbus/xenbus_probe.c 2006-08-17 15:19:20.000000000 +0200 +++ source-lnx-stable-22813/drivers/xen/xenbus/xenbus_probe.c 2006-08-17 15:20:36.000000000 +0200 @@ -60,6 +60,14 @@ static struct notifier_block *xenstore_c static void wait_for_devices(struct xenbus_driver *xendrv); +static int xenbus_probe_frontend(const char *type, const char *name); +static int xenbus_uevent_backend(struct device *dev, char **envp, + int num_envp, char *buffer, int buffer_size); +static int xenbus_probe_backend(const char *type, const char *domid); + +static int xenbus_dev_probe(struct device *_dev); +static int xenbus_dev_remove(struct device *_dev); + /* If something in array of ids matches this device, return it. */ static const struct xenbus_device_id * match_device(const struct xenbus_device_id *arr, struct xenbus_device *dev) @@ -168,15 +176,16 @@ static int read_frontend_details(struct /* Bus type for frontend drivers. */ -static int xenbus_probe_frontend(const char *type, const char *name); static struct xen_bus_type xenbus_frontend = { .root = "device", .levels = 2, /* device/type/ */ .get_bus_id = frontend_bus_id, .probe = xenbus_probe_frontend, .bus = { - .name = "xen", - .match = xenbus_match, + .name = "xen", + .match = xenbus_match, + .probe = xenbus_dev_probe, + .remove = xenbus_dev_remove, }, .dev = { .bus_id = "xen", @@ -221,18 +230,17 @@ static int backend_bus_id(char bus_id[BU return 0; } -static int xenbus_uevent_backend(struct device *dev, char **envp, - int num_envp, char *buffer, int buffer_size); -static int xenbus_probe_backend(const char *type, const char *domid); static struct xen_bus_type xenbus_backend = { .root = "backend", .levels = 3, /* backend/type// */ .get_bus_id = backend_bus_id, .probe = xenbus_probe_backend, .bus = { - .name = "xen-backend", - .match = xenbus_match, - .uevent = xenbus_uevent_backend, + .name = "xen-backend", + .match = xenbus_match, + .probe = xenbus_dev_probe, + .remove = xenbus_dev_remove, + .uevent = xenbus_uevent_backend, }, .dev = { .bus_id = "xen-backend", @@ -399,8 +407,6 @@ static int xenbus_register_driver_common drv->driver.name = drv->name; drv->driver.bus = &bus->bus; drv->driver.owner = drv->owner; - drv->driver.probe = xenbus_dev_probe; - drv->driver.remove = xenbus_dev_remove; mutex_lock(&xenwatch_mutex); ret = driver_register(&drv->driver); --------------060802070109020504050800 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------060802070109020504050800--