Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1ce1be5 authored by Ian Campbell's avatar Ian Campbell Committed by Jeremy Fitzhardinge
Browse files

xen: remove suspend_cancel hook 



Remove suspend_cancel hook from xenbus_driver, in preparation for using
the device model for suspending.

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
parent 6d02c426

drivers/xen/xenbus/xenbus_probe.c

+0 −23
Original line number Diff line number Diff line
@@ -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);

include/xen/xenbus.h

+0 −1
Original line number Diff line number Diff line
@@ -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;