Commit db8f5086 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

cpuidle, ARM: OMAP2+: powerdomain: Remove trace_.*_rcuidle() 



OMAP was the one and only user.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20230112195541.782536366@infradead.org
parent 259c95af

arch/arm/mach-omap2/powerdomain.c

+5 −5
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag) 
			trace_state = (PWRDM_TRACE_STATES_FLAG |

				       ((next & OMAP_POWERSTATE_MASK) << 8) |

				       ((prev & OMAP_POWERSTATE_MASK) << 0));

			trace_power_domain_target_rcuidle(pwrdm->name,

			trace_power_domain_target(pwrdm->name,

						  trace_state,

						  raw_smp_processor_id());

		}
@@ -541,7 +541,7 @@ int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst) 


	if (arch_pwrdm && arch_pwrdm->pwrdm_set_next_pwrst) {

		/* Trace the pwrdm desired target state */

		trace_power_domain_target_rcuidle(pwrdm->name, pwrst,

		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);

drivers/base/power/runtime.c

+12 −12
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static int rpm_idle(struct device *dev, int rpmflags) 
	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. */
@@ -508,7 +508,7 @@ static int rpm_idle(struct device *dev, int rpmflags) 
			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;

	}
@@ -530,7 +530,7 @@ static int rpm_idle(struct device *dev, int rpmflags) 
	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);

}
@@ -562,7 +562,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) 
	struct device *parent = NULL;

	int retval;



	trace_rpm_suspend_rcuidle(dev, rpmflags);

	trace_rpm_suspend(dev, rpmflags);



 repeat:

	retval = rpm_check_suspend_allowed(dev);
@@ -713,7 +713,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) 
	}



 out:

	trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval);

	trace_rpm_return_int(dev, _THIS_IP_, retval);



	return retval;
@@ -765,7 +765,7 @@ static int rpm_resume(struct device *dev, int rpmflags) 
	struct device *parent = NULL;

	int retval = 0;



	trace_rpm_resume_rcuidle(dev, rpmflags);

	trace_rpm_resume(dev, rpmflags);



 repeat:

	if (dev->power.runtime_error) {
@@ -935,7 +935,7 @@ static int rpm_resume(struct device *dev, int rpmflags) 
		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;

}
@@ -1091,7 +1091,7 @@ int __pm_runtime_idle(struct device *dev, int rpmflags) 
		if (retval < 0) {

			return retval;

		} else if (retval > 0) {

			trace_rpm_usage_rcuidle(dev, rpmflags);

			trace_rpm_usage(dev, rpmflags);

			return 0;

		}

	}
@@ -1129,7 +1129,7 @@ int __pm_runtime_suspend(struct device *dev, int rpmflags) 
		if (retval < 0) {

			return retval;

		} else if (retval > 0) {

			trace_rpm_usage_rcuidle(dev, rpmflags);

			trace_rpm_usage(dev, rpmflags);

			return 0;

		}

	}
@@ -1212,7 +1212,7 @@ int pm_runtime_get_if_active(struct device *dev, bool ign_usage_count) 
	} 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;
@@ -1576,7 +1576,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);
@@ -1646,7 +1646,7 @@ static void update_autosuspend(struct device *dev, int old_delay, int old_use) 
			atomic_inc(&dev->power.usage_count);

			rpm_resume(dev, 0);

		} else {

			trace_rpm_usage_rcuidle(dev, 0);

			trace_rpm_usage(dev, 0);

		}

	}