Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / sh / kernel / cpu / shmobile / pm_runtime.c

diff --git a/arch/sh/kernel/cpu/shmobile/pm_runtime.c b/arch/sh/kernel/cpu/shmobile/pm_runtime.c
index 22db127..bf280c8 100644 (file)
--- a/arch/sh/kernel/cpu/shmobile/pm_runtime.c
+++ b/arch/sh/kernel/cpu/shmobile/pm_runtime.c
@@ -157,7 +157,7 @@ static int default_platform_runtime_suspend(struct device *dev)
        might_sleep();
 
        /* catch misconfigured drivers not starting with resume */
-       if (test_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags)) {
+       if (test_bit(PDEV_ARCHDATA_FLAG_INIT, &ad->flags)) {
                ret = -EINVAL;
                goto out;
        }
@@ -170,8 +170,8 @@ static int default_platform_runtime_suspend(struct device *dev)
 
        /* put device on idle list */
        spin_lock_irqsave(&hwblk_lock, flags);
-       list_add_tail(&pdev->archdata.entry, &hwblk_idle_list);
-       __set_bit(PDEV_ARCHDATA_FLAG_IDLE, &pdev->archdata.flags);
+       list_add_tail(&ad->entry, &hwblk_idle_list);
+       __set_bit(PDEV_ARCHDATA_FLAG_IDLE, &ad->flags);
        spin_unlock_irqrestore(&hwblk_lock, flags);
 
        /* increase idle count */
@@ -256,7 +256,7 @@ out:
        return ret;
 }
 
-static struct dev_power_domain default_power_domain = {
+static struct dev_pm_domain default_pm_domain = {
        .ops = {
                .runtime_suspend = default_platform_runtime_suspend,
                .runtime_resume = default_platform_runtime_resume,
@@ -285,7 +285,7 @@ static int platform_bus_notify(struct notifier_block *nb,
                hwblk_disable(hwblk_info, hwblk);
                /* make sure driver re-inits itself once */
                __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags);
-               dev->pwr_domain = &default_power_domain;
+               dev->pm_domain = &default_pm_domain;
                break;
        /* TODO: add BUS_NOTIFY_BIND_DRIVER and increase idle count */
        case BUS_NOTIFY_BOUND_DRIVER:
@@ -299,7 +299,7 @@ static int platform_bus_notify(struct notifier_block *nb,
                __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags);
                break;
        case BUS_NOTIFY_DEL_DEVICE:
-               dev->pwr_domain = NULL;
+               dev->pm_domain = NULL;
                break;
        }
        return 0;