Re: [PATCH -mm 4/7] PM: Remove suspend and resume support from struct device_type

[Kay Sievers]

Dmitry, you added this recently, is this used in any code you plan to
merge soon?

Thanks,
Kay

On 6/13/07, Rafael J. Wysocki <rjw@xxxxxxx> wrote:
> From: Rafael J. Wysocki <rjw@xxxxxxx>
>
> The suspend and resume support in struct device_type (include/linux/device.h)
> is not used anywhere.  It is also undocumented, so it can be removed.
>
> Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
> ---
>  drivers/base/power/resume.c  |    5 -----
>  drivers/base/power/suspend.c |    7 -------
>  include/linux/device.h       |    2 --
>  3 files changed, 14 deletions(-)
>
> Index: linux-2.6.22-rc4-mm2/drivers/base/power/resume.c
> ===================================================================
> --- linux-2.6.22-rc4-mm2.orig/drivers/base/power/resume.c
> +++ linux-2.6.22-rc4-mm2/drivers/base/power/resume.c
> @@ -41,11 +41,6 @@ int resume_device(struct device * dev)
>                 error = dev->bus->resume(dev);
>         }
>
> -       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);
> Index: linux-2.6.22-rc4-mm2/drivers/base/power/suspend.c
> ===================================================================
> --- linux-2.6.22-rc4-mm2.orig/drivers/base/power/suspend.c
> +++ linux-2.6.22-rc4-mm2/drivers/base/power/suspend.c
> @@ -79,13 +79,6 @@ int suspend_device(struct device * dev,
>                 suspend_report_result(dev->class->suspend, error);
>         }
>
> -       if (!error && dev->type && dev->type->suspend
> -           && !dev->power.power_state.event) {
> -               suspend_device_dbg(dev, state, "type ");
> -               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) {
>                 suspend_device_dbg(dev, state, "");
> Index: linux-2.6.22-rc4-mm2/include/linux/device.h
> ===================================================================
> --- linux-2.6.22-rc4-mm2.orig/include/linux/device.h
> +++ linux-2.6.22-rc4-mm2/include/linux/device.h
> @@ -340,8 +340,6 @@ 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 */
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/