diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2009-02-09 15:05:50 -0500 |
---|---|---|
committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-03-30 12:26:55 -0400 |
commit | a1ce1be578365a4da7e7d7db4812539d2d5da763 (patch) | |
tree | 93110109c0aba28f654dfe0a12e189a054affe5e /drivers/xen | |
parent | 6d02c42698f99eccb290ac53d4f10ca883b9f90c (diff) |
xen: remove suspend_cancel hook
Remove suspend_cancel hook from xenbus_driver, in preparation for using
the device model for suspending.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r-- | drivers/xen/xenbus/xenbus_probe.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index 773d1cf23283..bd20361fb099 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c | |||
@@ -689,27 +689,6 @@ static int suspend_dev(struct device *dev, void *data) | |||
689 | return 0; | 689 | return 0; |
690 | } | 690 | } |
691 | 691 | ||
692 | static int suspend_cancel_dev(struct device *dev, void *data) | ||
693 | { | ||
694 | int err = 0; | ||
695 | struct xenbus_driver *drv; | ||
696 | struct xenbus_device *xdev; | ||
697 | |||
698 | DPRINTK(""); | ||
699 | |||
700 | if (dev->driver == NULL) | ||
701 | return 0; | ||
702 | drv = to_xenbus_driver(dev->driver); | ||
703 | xdev = container_of(dev, struct xenbus_device, dev); | ||
704 | if (drv->suspend_cancel) | ||
705 | err = drv->suspend_cancel(xdev); | ||
706 | if (err) | ||
707 | printk(KERN_WARNING | ||
708 | "xenbus: suspend_cancel %s failed: %i\n", | ||
709 | dev_name(dev), err); | ||
710 | return 0; | ||
711 | } | ||
712 | |||
713 | static int resume_dev(struct device *dev, void *data) | 692 | static int resume_dev(struct device *dev, void *data) |
714 | { | 693 | { |
715 | int err; | 694 | int err; |
@@ -777,8 +756,6 @@ EXPORT_SYMBOL_GPL(xenbus_resume); | |||
777 | void xenbus_suspend_cancel(void) | 756 | void xenbus_suspend_cancel(void) |
778 | { | 757 | { |
779 | xs_suspend_cancel(); | 758 | xs_suspend_cancel(); |
780 | bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, suspend_cancel_dev); | ||
781 | xenbus_backend_resume(suspend_cancel_dev); | ||
782 | } | 759 | } |
783 | EXPORT_SYMBOL_GPL(xenbus_suspend_cancel); | 760 | EXPORT_SYMBOL_GPL(xenbus_suspend_cancel); |
784 | 761 | ||