dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

xen/xenbus: clean up noise in xenbus_probe.c

Browse source 
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
[corresponds to 01aded30aaef in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Jeremy Fitzhardinge 2010-03-29 14:38:12 -07:00 committed by Konrad Rzeszutek Wilk
parent a16448e071
commit a39bda27b3
1 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/xen/xenbus/xenbus_probe.c
View file

@ -479,23 +479,16 @@ static int xenbus_probe_device_type(struct xen_bus_type *bus, const char *type)
unsigned int dir_n = 0;
int i;
printk(KERN_CRIT "%s type %s\n", __func__, type);
dir = xenbus_directory(XBT_NIL, bus->root, type, &dir_n);
if (IS_ERR(dir)) {
printk(KERN_CRIT "%s failed xenbus_directory\n", __func__);
if (IS_ERR(dir))
return PTR_ERR(dir);
}
for (i = 0; i < dir_n; i++) {
printk(KERN_CRIT "%s %d/%d %s\n", __func__, i+1,dir_n, dir[i]);
err = bus->probe(bus, type, dir[i]);
if (err) {
printk(KERN_CRIT "%s failed\n", __func__);
if (err)
break;
}
}
printk("%s done\n", __func__);
kfree(dir);
return err;
}
@ -506,23 +499,16 @@ int xenbus_probe_devices(struct xen_bus_type *bus)
char **dir;
unsigned int i, dir_n;
printk(KERN_CRIT "%s %s\n", __func__, bus->root);
dir = xenbus_directory(XBT_NIL, bus->root, "", &dir_n);
if (IS_ERR(dir)) {
printk(KERN_CRIT "%s failed xenbus_directory\n", __func__);
if (IS_ERR(dir))
return PTR_ERR(dir);
}
for (i = 0; i < dir_n; i++) {
printk(KERN_CRIT "%s %d/%d %s\n", __func__, i+1,dir_n, dir[i]);
err = xenbus_probe_device_type(bus, dir[i]);
if (err) {
printk(KERN_CRIT "%s failed\n", __func__);
if (err)
break;
}
}
printk("%s done\n", __func__);
kfree(dir);
return err;
}
@ -679,8 +665,6 @@ void xenbus_probe(struct work_struct *unused)
{
xenstored_ready = 1;
printk(KERN_CRIT "xenbus_probe wake_waiting\n");
/* Notify others that xenstore is up */
blocking_notifier_call_chain(&xenstore_chain, 0, NULL);
}
@ -776,7 +760,6 @@ static int __init xenbus_init(void)
proc_mkdir("xen", NULL);
#endif
printk(KERN_CRIT "%s ok\n", __func__);
return 0;
out_error: