aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2009-07-25 16:24:54 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2009-09-14 14:26:59 -0400
commitc90cd332d3dbf9fc78934b8bda271c1f909216ea (patch)
tree2fc3010e813f0f04961be54cf9ce31e27965fc28
parent8de0307326be94148436082a9abf365da8e3c66d (diff)
floppy: Switch driver to dev_pm_ops
Gets rid of the following warning: Platform driver 'floppy' needs updating - please use dev_pm_ops [rjw: Fixed up the definition of floppy_pm_ops.] Signed-off-by: Frans Pop <elendil@planet.nl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--drivers/block/floppy.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 91b753013780..2b387c2260d8 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4151,7 +4151,7 @@ static void floppy_device_release(struct device *dev)
4151{ 4151{
4152} 4152}
4153 4153
4154static int floppy_resume(struct platform_device *dev) 4154static int floppy_resume(struct device *dev)
4155{ 4155{
4156 int fdc; 4156 int fdc;
4157 4157
@@ -4162,10 +4162,15 @@ static int floppy_resume(struct platform_device *dev)
4162 return 0; 4162 return 0;
4163} 4163}
4164 4164
4165static struct platform_driver floppy_driver = { 4165static struct dev_pm_ops floppy_pm_ops = {
4166 .resume = floppy_resume, 4166 .resume = floppy_resume,
4167 .restore = floppy_resume,
4168};
4169
4170static struct platform_driver floppy_driver = {
4167 .driver = { 4171 .driver = {
4168 .name = "floppy", 4172 .name = "floppy",
4173 .pm = &floppy_pm_ops,
4169 }, 4174 },
4170}; 4175};
4171 4176