[PATCH 35/36] cpuidle,powerdomain: Remove trace_.*_rcuidle()

[Peter Zijlstra <peterz@xxxxxxxxxxxxx>]

OMAP was the one and only user.

Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
---
 arch/arm/mach-omap2/powerdomain.c |   10 +++++-----
 drivers/base/power/runtime.c      |   24 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -187,9 +187,9 @@ static int _pwrdm_state_switch(struct po
                        trace_state = (PWRDM_TRACE_STATES_FLAG |
                                       ((next & OMAP_POWERSTATE_MASK) << 8) |
                                       ((prev & OMAP_POWERSTATE_MASK) << 0));
-                       trace_power_domain_target_rcuidle(pwrdm->name,
-                                                         trace_state,
-                                                         
raw_smp_processor_id());
+                       trace_power_domain_target(pwrdm->name,
+                                                 trace_state,
+                                                 raw_smp_processor_id());
                }
                break;
        default:
@@ -541,8 +541,8 @@ int pwrdm_set_next_pwrst(struct powerdom
 
        if (arch_pwrdm && arch_pwrdm->pwrdm_set_next_pwrst) {
                /* Trace the pwrdm desired target state */
-               trace_power_domain_target_rcuidle(pwrdm->name, pwrst,
-                                                 raw_smp_processor_id());
+               trace_power_domain_target(pwrdm->name, pwrst,
+                                         raw_smp_processor_id());
                /* Program the pwrdm desired target state */
                ret = arch_pwrdm->pwrdm_set_next_pwrst(pwrdm, pwrst);
        }
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -442,7 +442,7 @@ static int rpm_idle(struct device *dev,
        int (*callback)(struct device *);
        int retval;
 
-       trace_rpm_idle_rcuidle(dev, rpmflags);
+       trace_rpm_idle(dev, rpmflags);
        retval = rpm_check_suspend_allowed(dev);
        if (retval < 0)
                ;       /* Conditions are wrong. */
@@ -481,7 +481,7 @@ static int rpm_idle(struct device *dev,
                        dev->power.request_pending = true;
                        queue_work(pm_wq, &dev->power.work);
                }
-               trace_rpm_return_int_rcuidle(dev, _THIS_IP_, 0);
+               trace_rpm_return_int(dev, _THIS_IP_, 0);
                return 0;
        }
 
@@ -493,7 +493,7 @@ static int rpm_idle(struct device *dev,
        wake_up_all(&dev->power.wait_queue);
 
  out:
-       trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval);
+       trace_rpm_return_int(dev, _THIS_IP_, retval);
        return retval ? retval : rpm_suspend(dev, rpmflags | RPM_AUTO);
 }
 
@@ -557,7 +557,7 @@ static int rpm_suspend(struct device *de
        struct device *parent = NULL;
        int retval;
 
-       trace_rpm_suspend_rcuidle(dev, rpmflags);
+       trace_rpm_suspend(dev, rpmflags);
 
  repeat:
        retval = rpm_check_suspend_allowed(dev);
@@ -708,7 +708,7 @@ static int rpm_suspend(struct device *de
        }
 
  out:
-       trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval);
+       trace_rpm_return_int(dev, _THIS_IP_, retval);
 
        return retval;
 
@@ -760,7 +760,7 @@ static int rpm_resume(struct device *dev
        struct device *parent = NULL;
        int retval = 0;
 
-       trace_rpm_resume_rcuidle(dev, rpmflags);
+       trace_rpm_resume(dev, rpmflags);
 
  repeat:
        if (dev->power.runtime_error) {
@@ -925,7 +925,7 @@ static int rpm_resume(struct device *dev
                spin_lock_irq(&dev->power.lock);
        }
 
-       trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval);
+       trace_rpm_return_int(dev, _THIS_IP_, retval);
 
        return retval;
 }
@@ -1081,7 +1081,7 @@ int __pm_runtime_idle(struct device *dev
                if (retval < 0) {
                        return retval;
                } else if (retval > 0) {
-                       trace_rpm_usage_rcuidle(dev, rpmflags);
+                       trace_rpm_usage(dev, rpmflags);
                        return 0;
                }
        }
@@ -1119,7 +1119,7 @@ int __pm_runtime_suspend(struct device *
                if (retval < 0) {
                        return retval;
                } else if (retval > 0) {
-                       trace_rpm_usage_rcuidle(dev, rpmflags);
+                       trace_rpm_usage(dev, rpmflags);
                        return 0;
                }
        }
@@ -1202,7 +1202,7 @@ int pm_runtime_get_if_active(struct devi
        } else {
                retval = atomic_inc_not_zero(&dev->power.usage_count);
        }
-       trace_rpm_usage_rcuidle(dev, 0);
+       trace_rpm_usage(dev, 0);
        spin_unlock_irqrestore(&dev->power.lock, flags);
 
        return retval;
@@ -1566,7 +1566,7 @@ void pm_runtime_allow(struct device *dev
        if (ret == 0)
                rpm_idle(dev, RPM_AUTO | RPM_ASYNC);
        else if (ret > 0)
-               trace_rpm_usage_rcuidle(dev, RPM_AUTO | RPM_ASYNC);
+               trace_rpm_usage(dev, RPM_AUTO | RPM_ASYNC);
 
  out:
        spin_unlock_irq(&dev->power.lock);
@@ -1635,7 +1635,7 @@ static void update_autosuspend(struct de
                        atomic_inc(&dev->power.usage_count);
                        rpm_resume(dev, 0);
                } else {
-                       trace_rpm_usage_rcuidle(dev, 0);
+                       trace_rpm_usage(dev, 0);
                }
        }