@@ -468,7 +468,7 @@ static int rpm_idle(struct device *dev, int rpmflags)
468468 int (* callback )(struct device * );
469469 int retval ;
470470
471- trace_rpm_idle_rcuidle (dev , rpmflags );
471+ trace_rpm_idle (dev , rpmflags );
472472 retval = rpm_check_suspend_allowed (dev );
473473 if (retval < 0 )
474474 ; /* Conditions are wrong. */
@@ -508,7 +508,7 @@ static int rpm_idle(struct device *dev, int rpmflags)
508508 dev -> power .request_pending = true;
509509 queue_work (pm_wq , & dev -> power .work );
510510 }
511- trace_rpm_return_int_rcuidle (dev , _THIS_IP_ , 0 );
511+ trace_rpm_return_int (dev , _THIS_IP_ , 0 );
512512 return 0 ;
513513 }
514514
@@ -530,7 +530,7 @@ static int rpm_idle(struct device *dev, int rpmflags)
530530 wake_up_all (& dev -> power .wait_queue );
531531
532532 out :
533- trace_rpm_return_int_rcuidle (dev , _THIS_IP_ , retval );
533+ trace_rpm_return_int (dev , _THIS_IP_ , retval );
534534 return retval ? retval : rpm_suspend (dev , rpmflags | RPM_AUTO );
535535}
536536
@@ -562,7 +562,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
562562 struct device * parent = NULL ;
563563 int retval ;
564564
565- trace_rpm_suspend_rcuidle (dev , rpmflags );
565+ trace_rpm_suspend (dev , rpmflags );
566566
567567 repeat :
568568 retval = rpm_check_suspend_allowed (dev );
@@ -713,7 +713,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
713713 }
714714
715715 out :
716- trace_rpm_return_int_rcuidle (dev , _THIS_IP_ , retval );
716+ trace_rpm_return_int (dev , _THIS_IP_ , retval );
717717
718718 return retval ;
719719
@@ -765,7 +765,7 @@ static int rpm_resume(struct device *dev, int rpmflags)
765765 struct device * parent = NULL ;
766766 int retval = 0 ;
767767
768- trace_rpm_resume_rcuidle (dev , rpmflags );
768+ trace_rpm_resume (dev , rpmflags );
769769
770770 repeat :
771771 if (dev -> power .runtime_error ) {
@@ -935,7 +935,7 @@ static int rpm_resume(struct device *dev, int rpmflags)
935935 spin_lock_irq (& dev -> power .lock );
936936 }
937937
938- trace_rpm_return_int_rcuidle (dev , _THIS_IP_ , retval );
938+ trace_rpm_return_int (dev , _THIS_IP_ , retval );
939939
940940 return retval ;
941941}
@@ -1091,7 +1091,7 @@ int __pm_runtime_idle(struct device *dev, int rpmflags)
10911091 if (retval < 0 ) {
10921092 return retval ;
10931093 } else if (retval > 0 ) {
1094- trace_rpm_usage_rcuidle (dev , rpmflags );
1094+ trace_rpm_usage (dev , rpmflags );
10951095 return 0 ;
10961096 }
10971097 }
@@ -1129,7 +1129,7 @@ int __pm_runtime_suspend(struct device *dev, int rpmflags)
11291129 if (retval < 0 ) {
11301130 return retval ;
11311131 } else if (retval > 0 ) {
1132- trace_rpm_usage_rcuidle (dev , rpmflags );
1132+ trace_rpm_usage (dev , rpmflags );
11331133 return 0 ;
11341134 }
11351135 }
@@ -1212,7 +1212,7 @@ int pm_runtime_get_if_active(struct device *dev, bool ign_usage_count)
12121212 } else {
12131213 retval = atomic_inc_not_zero (& dev -> power .usage_count );
12141214 }
1215- trace_rpm_usage_rcuidle (dev , 0 );
1215+ trace_rpm_usage (dev , 0 );
12161216 spin_unlock_irqrestore (& dev -> power .lock , flags );
12171217
12181218 return retval ;
@@ -1576,7 +1576,7 @@ void pm_runtime_allow(struct device *dev)
15761576 if (ret == 0 )
15771577 rpm_idle (dev , RPM_AUTO | RPM_ASYNC );
15781578 else if (ret > 0 )
1579- trace_rpm_usage_rcuidle (dev , RPM_AUTO | RPM_ASYNC );
1579+ trace_rpm_usage (dev , RPM_AUTO | RPM_ASYNC );
15801580
15811581 out :
15821582 spin_unlock_irq (& dev -> power .lock );
@@ -1646,7 +1646,7 @@ static void update_autosuspend(struct device *dev, int old_delay, int old_use)
16461646 atomic_inc (& dev -> power .usage_count );
16471647 rpm_resume (dev , 0 );
16481648 } else {
1649- trace_rpm_usage_rcuidle (dev , 0 );
1649+ trace_rpm_usage (dev , 0 );
16501650 }
16511651 }
16521652
0 commit comments