Driver core: add suspend() and resume() to struct device_type

Driver core: add suspend() and resume() to struct device_type

In cases when there are devices of different types in the same class
we can't use class's implementation of suspend and resume methods and
we need to add them to struct device_type instead.

Also fix error handling in resume code (we should not try to call
class's resume method iof bus's resume method for the device failed.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 020be36705a6827f38bfa15c83a304672b9e9c55..a2c64188d7133fc95c31343592039f7ace18a64b 100644 (file)
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -26,7 +26,9 @@ int resume_device(struct device * dev)
 
        TRACE_DEVICE(dev);
        TRACE_RESUME(0);
+
        down(&dev->sem);
+
        if (dev->power.pm_parent
                        && dev->power.pm_parent->power.power_state.event) {
                dev_err(dev, "PM: resume from %d, parent %s still %d\n",
@@ -34,15 +36,24 @@ int resume_device(struct device * dev)
                        dev->power.pm_parent->bus_id,
                        dev->power.pm_parent->power.power_state.event);
        }
+
        if (dev->bus && dev->bus->resume) {
                dev_dbg(dev,"resuming\n");
                error = dev->bus->resume(dev);
        }
-       if (dev->class && dev->class->resume) {
+
+       if (!error && dev->type && dev->type->resume) {
+               dev_dbg(dev,"resuming\n");
+               error = dev->type->resume(dev);
+       }
+
+       if (!error && dev->class && dev->class->resume) {
                dev_dbg(dev,"class resume\n");
                error = dev->class->resume(dev);
        }
+
        up(&dev->sem);
+
        TRACE_RESUME(error);
        return error;
 }

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index ece136bf97e35d2921b9ac8b1576eb32d53e7252..42d2b86ba7652944917a2b40a31d70e485a60622 100644 (file)
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -78,6 +78,18 @@ int suspend_device(struct device * dev, pm_message_t state)
                suspend_report_result(dev->class->suspend, error);
        }
 
+       if (!error && dev->type && dev->type->suspend && !dev->power.power_state.event) {
+               dev_dbg(dev, "%s%s\n",
+                       suspend_verb(state.event),
+                       ((state.event == PM_EVENT_SUSPEND)
+                                       && device_may_wakeup(dev))
+                               ? ", may wakeup"
+                               : ""
+                       );
+               error = dev->type->suspend(dev, state);
+               suspend_report_result(dev->type->suspend, error);
+       }
+
        if (!error && dev->bus && dev->bus->suspend && !dev->power.power_state.event) {
                dev_dbg(dev, "%s%s\n",
                        suspend_verb(state.event),

diff --git a/include/linux/device.h b/include/linux/device.h
index c9dc458e8e507afffe4337e4fd20d922ce7b7494..af603a1376904a12c53058cff0bed6e07dfce43a 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -344,6 +344,8 @@ struct device_type {
        int (*uevent)(struct device *dev, char **envp, int num_envp,
                      char *buffer, int buffer_size);
        void (*release)(struct device *dev);
+       int (*suspend)(struct device * dev, pm_message_t state);
+       int (*resume)(struct device * dev);
 };
 
 /* interface for exporting device attributes */