aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-03-29 17:38:12 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-01-05 16:30:46 -0500
commita39bda27b35266beae945f48e0b6ab58d06a17d5 (patch)
tree67b5b5ce557ee697d3c9dc18806aecfe45ff9922 /drivers/xen
parenta16448e071ca80e599ea4f780242f40a0a213b07 (diff)
xen/xenbus: clean up noise in xenbus_probe.c
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>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/xenbus/xenbus_probe.c29
1 files changed, 6 insertions, 23 deletions
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 96bd1ef61ebe..811923451218 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -479,23 +479,16 @@ static int xenbus_probe_device_type(struct xen_bus_type *bus, const char *type)
479 unsigned int dir_n = 0; 479 unsigned int dir_n = 0;
480 int i; 480 int i;
481 481
482 printk(KERN_CRIT "%s type %s\n", __func__, type);
483
484 dir = xenbus_directory(XBT_NIL, bus->root, type, &dir_n); 482 dir = xenbus_directory(XBT_NIL, bus->root, type, &dir_n);
485 if (IS_ERR(dir)) { 483 if (IS_ERR(dir))
486 printk(KERN_CRIT "%s failed xenbus_directory\n", __func__);
487 return PTR_ERR(dir); 484 return PTR_ERR(dir);
488 }
489 485
490 for (i = 0; i < dir_n; i++) { 486 for (i = 0; i < dir_n; i++) {
491 printk(KERN_CRIT "%s %d/%d %s\n", __func__, i+1,dir_n, dir[i]);
492 err = bus->probe(bus, type, dir[i]); 487 err = bus->probe(bus, type, dir[i]);
493 if (err) { 488 if (err)
494 printk(KERN_CRIT "%s failed\n", __func__);
495 break; 489 break;
496 }
497 } 490 }
498 printk("%s done\n", __func__); 491
499 kfree(dir); 492 kfree(dir);
500 return err; 493 return err;
501} 494}
@@ -506,23 +499,16 @@ int xenbus_probe_devices(struct xen_bus_type *bus)
506 char **dir; 499 char **dir;
507 unsigned int i, dir_n; 500 unsigned int i, dir_n;
508 501
509 printk(KERN_CRIT "%s %s\n", __func__, bus->root);
510
511 dir = xenbus_directory(XBT_NIL, bus->root, "", &dir_n); 502 dir = xenbus_directory(XBT_NIL, bus->root, "", &dir_n);
512 if (IS_ERR(dir)) { 503 if (IS_ERR(dir))
513 printk(KERN_CRIT "%s failed xenbus_directory\n", __func__);
514 return PTR_ERR(dir); 504 return PTR_ERR(dir);
515 }
516 505
517 for (i = 0; i < dir_n; i++) { 506 for (i = 0; i < dir_n; i++) {
518 printk(KERN_CRIT "%s %d/%d %s\n", __func__, i+1,dir_n, dir[i]);
519 err = xenbus_probe_device_type(bus, dir[i]); 507 err = xenbus_probe_device_type(bus, dir[i]);
520 if (err) { 508 if (err)
521 printk(KERN_CRIT "%s failed\n", __func__);
522 break; 509 break;
523 }
524 } 510 }
525 printk("%s done\n", __func__); 511
526 kfree(dir); 512 kfree(dir);
527 return err; 513 return err;
528} 514}
@@ -679,8 +665,6 @@ void xenbus_probe(struct work_struct *unused)
679{ 665{
680 xenstored_ready = 1; 666 xenstored_ready = 1;
681 667
682 printk(KERN_CRIT "xenbus_probe wake_waiting\n");
683
684 /* Notify others that xenstore is up */ 668 /* Notify others that xenstore is up */
685 blocking_notifier_call_chain(&xenstore_chain, 0, NULL); 669 blocking_notifier_call_chain(&xenstore_chain, 0, NULL);
686} 670}
@@ -776,7 +760,6 @@ static int __init xenbus_init(void)
776 proc_mkdir("xen", NULL); 760 proc_mkdir("xen", NULL);
777#endif 761#endif
778 762
779 printk(KERN_CRIT "%s ok\n", __func__);
780 return 0; 763 return 0;
781 764
782 out_error: 765 out_error: