[PATCH 8/8] net/iucv: Use the new device_to_pm() helper to access struct dev_pm_ops

Krzysztof Wilczyński
2020-05-25T18:26:44Z

Use the new device_to_pm() helper to access Power Management callbacs
(struct dev_pm_ops) for a particular device (struct device_driver).

No functional change intended.

Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
---
net/iucv/iucv.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 9a2d023842fe..1a3029ab7c1f 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -1836,23 +1836,23 @@ static void iucv_external_interrupt(struct ext_code ext_code,

static int iucv_pm_prepare(struct device *dev)
{
- int rc = 0;
+ const struct dev_pm_ops *pm = driver_to_pm(dev->driver);

#ifdef CONFIG_PM_DEBUG
printk(KERN_INFO "iucv_pm_prepare\n");
#endif
- if (dev->driver && dev->driver->pm && dev->driver->pm->prepare)
- rc = dev->driver->pm->prepare(dev);
- return rc;
+ return pm && pm->prepare ? pm->prepare(dev) : 0;
}

static void iucv_pm_complete(struct device *dev)
{
+ const struct dev_pm_ops *pm = driver_to_pm(dev->driver);
+
#ifdef CONFIG_PM_DEBUG
printk(KERN_INFO "iucv_pm_complete\n");
#endif
- if (dev->driver && dev->driver->pm && dev->driver->pm->complete)
- dev->driver->pm->complete(dev);
+ if (pm && pm->complete)
+ pm->complete(dev);
}

/**
@@ -1883,6 +1883,7 @@ static int iucv_path_table_empty(void)
static int iucv_pm_freeze(struct device *dev)
{
int cpu;
+ const struct dev_pm_ops *pm;
struct iucv_irq_list *p, *n;
int rc = 0;

@@ -1902,8 +1903,9 @@ static int iucv_pm_freeze(struct device *dev)
}
}
iucv_pm_state = IUCV_PM_FREEZING;
- if (dev->driver && dev->driver->pm && dev->driver->pm->freeze)
- rc = dev->driver->pm->freeze(dev);
+ pm = driver_to_pm(dev->driver);
+ if (pm && pm->freeze)
+ rc = pm->freeze(dev);
if (iucv_path_table_empty())
iucv_disable();
return rc;
@@ -1919,6 +1921,7 @@ static int iucv_pm_freeze(struct device *dev)
*/
static int iucv_pm_thaw(struct device *dev)
{
+ const struct dev_pm_ops *pm;
int rc = 0;

#ifdef CONFIG_PM_DEBUG
@@ -1938,8 +1941,9 @@ static int iucv_pm_thaw(struct device *dev)
/* enable interrupts on all cpus */
iucv_setmask_mp();
}
- if (dev->driver && dev->driver->pm && dev->driver->pm->thaw)
- rc = dev->driver->pm->thaw(dev);
+ pm = driver_to_pm(dev->driver);
+ if (pm && pm->thaw)
+ rc = pm->thaw(dev);
out:
return rc;
}
@@ -1954,6 +1958,7 @@ static int iucv_pm_thaw(struct device *dev)
*/
static int iucv_pm_restore(struct device *dev)
{
+ const struct dev_pm_ops *pm;
int rc = 0;

#ifdef CONFIG_PM_DEBUG
@@ -1968,8 +1973,9 @@ static int iucv_pm_restore(struct device *dev)
if (rc)
goto out;
}
- if (dev->driver && dev->driver->pm && dev->driver->pm->restore)
- rc = dev->driver->pm->restore(dev);
+ pm = driver_to_pm(dev->driver);
+ if (pm && pm->restore)
+ rc = pm->restore(dev);
out:
return rc;
}
--
2.26.2