Commit 8fbb2e98 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Kalle Valo

cw1200: Fix suspend

The cw1200 driver implements suspend and resume callbacks and assigns them
to the suspend and resume fields of the device_driver struct. These
callbacks are never actually called by anything though.

Modify the driver to properly use dev_pm_ops so that the suspend function
is actually executed upon suspend and drop the empty resume function.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 0aef188a
...@@ -447,7 +447,7 @@ static int cw1200_spi_disconnect(struct spi_device *func) ...@@ -447,7 +447,7 @@ static int cw1200_spi_disconnect(struct spi_device *func)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int cw1200_spi_suspend(struct device *dev, pm_message_t state) static int cw1200_spi_suspend(struct device *dev)
{ {
struct hwbus_priv *self = spi_get_drvdata(to_spi_device(dev)); struct hwbus_priv *self = spi_get_drvdata(to_spi_device(dev));
...@@ -458,10 +458,8 @@ static int cw1200_spi_suspend(struct device *dev, pm_message_t state) ...@@ -458,10 +458,8 @@ static int cw1200_spi_suspend(struct device *dev, pm_message_t state)
return 0; return 0;
} }
static int cw1200_spi_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(cw1200_pm_ops, cw1200_spi_suspend, NULL);
{
return 0;
}
#endif #endif
static struct spi_driver spi_driver = { static struct spi_driver spi_driver = {
...@@ -472,8 +470,7 @@ static struct spi_driver spi_driver = { ...@@ -472,8 +470,7 @@ static struct spi_driver spi_driver = {
.bus = &spi_bus_type, .bus = &spi_bus_type,
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = cw1200_spi_suspend, .pm = &cw1200_pm_ops,
.resume = cw1200_spi_resume,
#endif #endif
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment