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>

2 files changed, 0 insertions, 24 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)
         return 0;
 }
 
-static int suspend_cancel_dev(struct device *dev, void *data)
-{
-        int err = 0;
-        struct xenbus_driver *drv;
-        struct xenbus_device *xdev;
-
-        DPRINTK("");
-
-        if (dev->driver == NULL)
-                return 0;
-        drv = to_xenbus_driver(dev->driver);
-        xdev = container_of(dev, struct xenbus_device, dev);
-        if (drv->suspend_cancel)
-                err = drv->suspend_cancel(xdev);
-        if (err)
-                printk(KERN_WARNING
-                       "xenbus: suspend_cancel %s failed: %i\n",
-                       dev_name(dev), err);
-        return 0;
-}
-
 static int resume_dev(struct device *dev, void *data)
 {
         int err;
@@ -777,8 +756,6 @@ EXPORT_SYMBOL_GPL(xenbus_resume);
 void xenbus_suspend_cancel(void)
 {
         xs_suspend_cancel();
-        bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, suspend_cancel_dev);
-        xenbus_backend_resume(suspend_cancel_dev);
 }
 EXPORT_SYMBOL_GPL(xenbus_suspend_cancel);
 
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
index f87f9614844d..0836772b9686 100644
--- a/include/xen/xenbus.h
+++ b/include/xen/xenbus.h
@@ -92,7 +92,6 @@ struct xenbus_driver {
                                  enum xenbus_state backend_state);
         int (*remove)(struct xenbus_device *dev);
         int (*suspend)(struct xenbus_device *dev);
-        int (*suspend_cancel)(struct xenbus_device *dev);
         int (*resume)(struct xenbus_device *dev);
         int (*uevent)(struct xenbus_device *, char **, int, char *, int);
         struct device_driver driver;