Skip to content

L
linux
Commit 4f31f5b1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files
Options

PM / crypto / ux500: Use struct dev_pm_ops for power management 

Make the ux500 crypto driver define its PM callbacks through
struct dev_pm_ops objects rather than by using legacy PM hooks
in struct platform_driver.
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent afec8a77
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 38 deletions
drivers/crypto/ux500/cryp/cryp_core.c
View file @ 4f31f5b1
...@@ -1661,27 +1661,26 @@ static void ux500_cryp_shutdown(struct platform_device *pdev) ...@@ -1661,27 +1661,26 @@ static void ux500_cryp_shutdown(struct platform_device *pdev)
} }
static int ux500_cryp_suspend(struct platform_device *pdev, pm_message_t state) static int ux500_cryp_suspend(struct device *dev)
{ {
int ret; int ret;
struct platform_device *pdev = to_platform_device(dev);
struct cryp_device_data *device_data; struct cryp_device_data *device_data;
struct resource *res_irq; struct resource *res_irq;
struct cryp_ctx *temp_ctx = NULL; struct cryp_ctx *temp_ctx = NULL;
dev_dbg(&pdev->dev, "[%s]", __func__); dev_dbg(dev, "[%s]", __func__);
/* Handle state? */ /* Handle state? */
device_data = platform_get_drvdata(pdev); device_data = platform_get_drvdata(pdev);
if (!device_data) { if (!device_data) {
dev_err(&pdev->dev, "[%s]: platform_get_drvdata() failed!", dev_err(dev, "[%s]: platform_get_drvdata() failed!", __func__);
__func__);
return -ENOMEM; return -ENOMEM;
} }
res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!res_irq) if (!res_irq)
dev_err(&pdev->dev, "[%s]: IORESOURCE_IRQ, unavailable", dev_err(dev, "[%s]: IORESOURCE_IRQ, unavailable", __func__);
__func__);
else else
disable_irq(res_irq->start); disable_irq(res_irq->start);
...@@ -1692,32 +1691,32 @@ static int ux500_cryp_suspend(struct platform_device *pdev, pm_message_t state) ...@@ -1692,32 +1691,32 @@ static int ux500_cryp_suspend(struct platform_device *pdev, pm_message_t state)
if (device_data->current_ctx == ++temp_ctx) { if (device_data->current_ctx == ++temp_ctx) {
if (down_interruptible(&driver_data.device_allocation)) if (down_interruptible(&driver_data.device_allocation))
dev_dbg(&pdev->dev, "[%s]: down_interruptible() " dev_dbg(dev, "[%s]: down_interruptible() failed",
"failed", __func__); __func__);
ret = cryp_disable_power(&pdev->dev, device_data, false); ret = cryp_disable_power(dev, device_data, false);
} else } else
ret = cryp_disable_power(&pdev->dev, device_data, true); ret = cryp_disable_power(dev, device_data, true);
if (ret) if (ret)
dev_err(&pdev->dev, "[%s]: cryp_disable_power()", __func__); dev_err(dev, "[%s]: cryp_disable_power()", __func__);
return ret; return ret;
} }
static int ux500_cryp_resume(struct platform_device *pdev) static int ux500_cryp_resume(struct device *dev)
{ {
int ret = 0; int ret = 0;
struct platform_device *pdev = to_platform_device(dev);
struct cryp_device_data *device_data; struct cryp_device_data *device_data;
struct resource *res_irq; struct resource *res_irq;
struct cryp_ctx *temp_ctx = NULL; struct cryp_ctx *temp_ctx = NULL;
dev_dbg(&pdev->dev, "[%s]", __func__); dev_dbg(dev, "[%s]", __func__);
device_data = platform_get_drvdata(pdev); device_data = platform_get_drvdata(pdev);
if (!device_data) { if (!device_data) {
dev_err(&pdev->dev, "[%s]: platform_get_drvdata() failed!", dev_err(dev, "[%s]: platform_get_drvdata() failed!", __func__);
__func__);
return -ENOMEM; return -ENOMEM;
} }
...@@ -1730,11 +1729,10 @@ static int ux500_cryp_resume(struct platform_device *pdev) ...@@ -1730,11 +1729,10 @@ static int ux500_cryp_resume(struct platform_device *pdev)
if (!device_data->current_ctx) if (!device_data->current_ctx)
up(&driver_data.device_allocation); up(&driver_data.device_allocation);
else else
ret = cryp_enable_power(&pdev->dev, device_data, true); ret = cryp_enable_power(dev, device_data, true);
if (ret) if (ret)
dev_err(&pdev->dev, "[%s]: cryp_enable_power() failed!", dev_err(dev, "[%s]: cryp_enable_power() failed!", __func__);
__func__);
else { else {
res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (res_irq) if (res_irq)
...@@ -1744,15 +1742,16 @@ static int ux500_cryp_resume(struct platform_device *pdev) ...@@ -1744,15 +1742,16 @@ static int ux500_cryp_resume(struct platform_device *pdev)
return ret; return ret;
} }
static SIMPLE_DEV_PM_OPS(ux500_cryp_pm, ux500_cryp_suspend, ux500_cryp_resume);
static struct platform_driver cryp_driver = { static struct platform_driver cryp_driver = {
.probe = ux500_cryp_probe, .probe = ux500_cryp_probe,
.remove = ux500_cryp_remove, .remove = ux500_cryp_remove,
.shutdown = ux500_cryp_shutdown, .shutdown = ux500_cryp_shutdown,
.suspend = ux500_cryp_suspend,
.resume = ux500_cryp_resume,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "cryp1" .name = "cryp1"
.pm = &ux500_cryp_pm,
} }
}; };
......
drivers/crypto/ux500/hash/hash_core.c
View file @ 4f31f5b1
...@@ -1894,19 +1894,17 @@ static void ux500_hash_shutdown(struct platform_device *pdev) ...@@ -1894,19 +1894,17 @@ static void ux500_hash_shutdown(struct platform_device *pdev)
/** /**
* ux500_hash_suspend - Function that suspends the hash device. * ux500_hash_suspend - Function that suspends the hash device.
* @pdev: The platform device. * @dev: Device to suspend.
* @state: -
*/ */
static int ux500_hash_suspend(struct platform_device *pdev, pm_message_t state) static int ux500_hash_suspend(struct device *dev)
{ {
int ret; int ret;
struct hash_device_data *device_data; struct hash_device_data *device_data;
struct hash_ctx *temp_ctx = NULL; struct hash_ctx *temp_ctx = NULL;
device_data = platform_get_drvdata(pdev); device_data = dev_get_drvdata(dev);
if (!device_data) { if (!device_data) {
dev_err(&pdev->dev, "[%s] platform_get_drvdata() failed!", dev_err(dev, "[%s] platform_get_drvdata() failed!", __func__);
__func__);
return -ENOMEM; return -ENOMEM;
} }
...@@ -1917,33 +1915,32 @@ static int ux500_hash_suspend(struct platform_device *pdev, pm_message_t state) ...@@ -1917,33 +1915,32 @@ static int ux500_hash_suspend(struct platform_device *pdev, pm_message_t state)
if (device_data->current_ctx == ++temp_ctx) { if (device_data->current_ctx == ++temp_ctx) {
if (down_interruptible(&driver_data.device_allocation)) if (down_interruptible(&driver_data.device_allocation))
dev_dbg(&pdev->dev, "[%s]: down_interruptible() " dev_dbg(dev, "[%s]: down_interruptible() failed",
"failed", __func__); __func__);
ret = hash_disable_power(device_data, false); ret = hash_disable_power(device_data, false);
} else } else
ret = hash_disable_power(device_data, true); ret = hash_disable_power(device_data, true);
if (ret) if (ret)
dev_err(&pdev->dev, "[%s]: hash_disable_power()", __func__); dev_err(dev, "[%s]: hash_disable_power()", __func__);
return ret; return ret;
} }
/** /**
* ux500_hash_resume - Function that resume the hash device. * ux500_hash_resume - Function that resume the hash device.
* @pdev: The platform device. * @dev: Device to resume.
*/ */
static int ux500_hash_resume(struct platform_device *pdev) static int ux500_hash_resume(struct device *dev)
{ {
int ret = 0; int ret = 0;
struct hash_device_data *device_data; struct hash_device_data *device_data;
struct hash_ctx *temp_ctx = NULL; struct hash_ctx *temp_ctx = NULL;
device_data = platform_get_drvdata(pdev); device_data = dev_get_drvdata(dev);
if (!device_data) { if (!device_data) {
dev_err(&pdev->dev, "[%s] platform_get_drvdata() failed!", dev_err(dev, "[%s] platform_get_drvdata() failed!", __func__);
__func__);
return -ENOMEM; return -ENOMEM;
} }
...@@ -1958,21 +1955,21 @@ static int ux500_hash_resume(struct platform_device *pdev) ...@@ -1958,21 +1955,21 @@ static int ux500_hash_resume(struct platform_device *pdev)
ret = hash_enable_power(device_data, true); ret = hash_enable_power(device_data, true);
if (ret) if (ret)
dev_err(&pdev->dev, "[%s]: hash_enable_power() failed!", dev_err(dev, "[%s]: hash_enable_power() failed!", __func__);
__func__);
return ret; return ret;
} }
static SIMPLE_DEV_PM_OPS(ux500_hash_pm, ux500_hash_suspend, ux500_hash_resume);
static struct platform_driver hash_driver = { static struct platform_driver hash_driver = {
.probe = ux500_hash_probe, .probe = ux500_hash_probe,
.remove = ux500_hash_remove, .remove = ux500_hash_remove,
.shutdown = ux500_hash_shutdown, .shutdown = ux500_hash_shutdown,
.suspend = ux500_hash_suspend,
.resume = ux500_hash_resume,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "hash1", .name = "hash1",
.pm = &ux500_hash_pm,
} }
}; };
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7