The patch titled
floppy: switch driver to dev_pm_ops
has been added to the -mm tree. Its filename is
floppy-switch-driver-to-dev_pm_ops.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: floppy: switch driver to dev_pm_ops
From: Frans Pop <elendil@xxxxxxxxx>
Gets rid of the following warning:
Platform driver 'floppy' needs updating - please use dev_pm_ops
Signed-off-by: Frans Pop <elendil@xxxxxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Jens Axboe <jens.axboe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/floppy.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff -puN drivers/block/floppy.c~floppy-switch-driver-to-dev_pm_ops drivers/block/floppy.c
--- a/drivers/block/floppy.c~floppy-switch-driver-to-dev_pm_ops
+++ a/drivers/block/floppy.c
@@ -4151,7 +4151,7 @@ static void floppy_device_release(struct
{
}
-static int floppy_resume(struct platform_device *dev)
+static int floppy_resume(struct device *dev)
{
int fdc;
@@ -4162,10 +4162,14 @@ static int floppy_resume(struct platform
return 0;
}
-static struct platform_driver floppy_driver = {
+static struct dev_pm_ops floppy_pm_ops = {
.resume = floppy_resume,
+};
+
+static struct platform_driver floppy_driver = {
.driver = {
.name = "floppy",
+ .pm = &floppy_pm_ops,
},
};
_
Patches currently in -mm which might be from elendil@xxxxxxxxx are
origin.patch
linux-next.patch
hp-wmi-switch-driver-to-dev_pm_ops.patch
floppy-switch-driver-to-dev_pm_ops.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
