timer: update debugobjects fixup callbacks return type
Update the return type to use bool instead of int, corresponding to cheange (debugobjects: make fixup functions return bool instead of int). Signed-off-by: Du, Changbin <changbin.du@intel.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Josh Triplett <josh@kernel.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tejun Heo <tj@kernel.org> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
02a982a6ec
commit
e3252464da
@ -334,7 +334,7 @@ static void *hrtimer_debug_hint(void *addr)
|
|||||||
* fixup_init is called when:
|
* fixup_init is called when:
|
||||||
* - an active object is initialized
|
* - an active object is initialized
|
||||||
*/
|
*/
|
||||||
static int hrtimer_fixup_init(void *addr, enum debug_obj_state state)
|
static bool hrtimer_fixup_init(void *addr, enum debug_obj_state state)
|
||||||
{
|
{
|
||||||
struct hrtimer *timer = addr;
|
struct hrtimer *timer = addr;
|
||||||
|
|
||||||
@ -342,9 +342,9 @@ static int hrtimer_fixup_init(void *addr, enum debug_obj_state state)
|
|||||||
case ODEBUG_STATE_ACTIVE:
|
case ODEBUG_STATE_ACTIVE:
|
||||||
hrtimer_cancel(timer);
|
hrtimer_cancel(timer);
|
||||||
debug_object_init(timer, &hrtimer_debug_descr);
|
debug_object_init(timer, &hrtimer_debug_descr);
|
||||||
return 1;
|
return true;
|
||||||
default:
|
default:
|
||||||
return 0;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -353,19 +353,19 @@ static int hrtimer_fixup_init(void *addr, enum debug_obj_state state)
|
|||||||
* - an active object is activated
|
* - an active object is activated
|
||||||
* - an unknown object is activated (might be a statically initialized object)
|
* - an unknown object is activated (might be a statically initialized object)
|
||||||
*/
|
*/
|
||||||
static int hrtimer_fixup_activate(void *addr, enum debug_obj_state state)
|
static bool hrtimer_fixup_activate(void *addr, enum debug_obj_state state)
|
||||||
{
|
{
|
||||||
switch (state) {
|
switch (state) {
|
||||||
|
|
||||||
case ODEBUG_STATE_NOTAVAILABLE:
|
case ODEBUG_STATE_NOTAVAILABLE:
|
||||||
WARN_ON_ONCE(1);
|
WARN_ON_ONCE(1);
|
||||||
return 0;
|
return false;
|
||||||
|
|
||||||
case ODEBUG_STATE_ACTIVE:
|
case ODEBUG_STATE_ACTIVE:
|
||||||
WARN_ON(1);
|
WARN_ON(1);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return 0;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -373,7 +373,7 @@ static int hrtimer_fixup_activate(void *addr, enum debug_obj_state state)
|
|||||||
* fixup_free is called when:
|
* fixup_free is called when:
|
||||||
* - an active object is freed
|
* - an active object is freed
|
||||||
*/
|
*/
|
||||||
static int hrtimer_fixup_free(void *addr, enum debug_obj_state state)
|
static bool hrtimer_fixup_free(void *addr, enum debug_obj_state state)
|
||||||
{
|
{
|
||||||
struct hrtimer *timer = addr;
|
struct hrtimer *timer = addr;
|
||||||
|
|
||||||
@ -381,9 +381,9 @@ static int hrtimer_fixup_free(void *addr, enum debug_obj_state state)
|
|||||||
case ODEBUG_STATE_ACTIVE:
|
case ODEBUG_STATE_ACTIVE:
|
||||||
hrtimer_cancel(timer);
|
hrtimer_cancel(timer);
|
||||||
debug_object_free(timer, &hrtimer_debug_descr);
|
debug_object_free(timer, &hrtimer_debug_descr);
|
||||||
return 1;
|
return true;
|
||||||
default:
|
default:
|
||||||
return 0;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -493,7 +493,7 @@ static void *timer_debug_hint(void *addr)
|
|||||||
* fixup_init is called when:
|
* fixup_init is called when:
|
||||||
* - an active object is initialized
|
* - an active object is initialized
|
||||||
*/
|
*/
|
||||||
static int timer_fixup_init(void *addr, enum debug_obj_state state)
|
static bool timer_fixup_init(void *addr, enum debug_obj_state state)
|
||||||
{
|
{
|
||||||
struct timer_list *timer = addr;
|
struct timer_list *timer = addr;
|
||||||
|
|
||||||
@ -501,9 +501,9 @@ static int timer_fixup_init(void *addr, enum debug_obj_state state)
|
|||||||
case ODEBUG_STATE_ACTIVE:
|
case ODEBUG_STATE_ACTIVE:
|
||||||
del_timer_sync(timer);
|
del_timer_sync(timer);
|
||||||
debug_object_init(timer, &timer_debug_descr);
|
debug_object_init(timer, &timer_debug_descr);
|
||||||
return 1;
|
return true;
|
||||||
default:
|
default:
|
||||||
return 0;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -518,7 +518,7 @@ static void stub_timer(unsigned long data)
|
|||||||
* - an active object is activated
|
* - an active object is activated
|
||||||
* - an unknown object is activated (might be a statically initialized object)
|
* - an unknown object is activated (might be a statically initialized object)
|
||||||
*/
|
*/
|
||||||
static int timer_fixup_activate(void *addr, enum debug_obj_state state)
|
static bool timer_fixup_activate(void *addr, enum debug_obj_state state)
|
||||||
{
|
{
|
||||||
struct timer_list *timer = addr;
|
struct timer_list *timer = addr;
|
||||||
|
|
||||||
@ -534,18 +534,18 @@ static int timer_fixup_activate(void *addr, enum debug_obj_state state)
|
|||||||
timer->entry.next == TIMER_ENTRY_STATIC) {
|
timer->entry.next == TIMER_ENTRY_STATIC) {
|
||||||
debug_object_init(timer, &timer_debug_descr);
|
debug_object_init(timer, &timer_debug_descr);
|
||||||
debug_object_activate(timer, &timer_debug_descr);
|
debug_object_activate(timer, &timer_debug_descr);
|
||||||
return 0;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
setup_timer(timer, stub_timer, 0);
|
setup_timer(timer, stub_timer, 0);
|
||||||
return 1;
|
return true;
|
||||||
}
|
}
|
||||||
return 0;
|
return false;
|
||||||
|
|
||||||
case ODEBUG_STATE_ACTIVE:
|
case ODEBUG_STATE_ACTIVE:
|
||||||
WARN_ON(1);
|
WARN_ON(1);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return 0;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -553,7 +553,7 @@ static int timer_fixup_activate(void *addr, enum debug_obj_state state)
|
|||||||
* fixup_free is called when:
|
* fixup_free is called when:
|
||||||
* - an active object is freed
|
* - an active object is freed
|
||||||
*/
|
*/
|
||||||
static int timer_fixup_free(void *addr, enum debug_obj_state state)
|
static bool timer_fixup_free(void *addr, enum debug_obj_state state)
|
||||||
{
|
{
|
||||||
struct timer_list *timer = addr;
|
struct timer_list *timer = addr;
|
||||||
|
|
||||||
@ -561,9 +561,9 @@ static int timer_fixup_free(void *addr, enum debug_obj_state state)
|
|||||||
case ODEBUG_STATE_ACTIVE:
|
case ODEBUG_STATE_ACTIVE:
|
||||||
del_timer_sync(timer);
|
del_timer_sync(timer);
|
||||||
debug_object_free(timer, &timer_debug_descr);
|
debug_object_free(timer, &timer_debug_descr);
|
||||||
return 1;
|
return true;
|
||||||
default:
|
default:
|
||||||
return 0;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -571,7 +571,7 @@ static int timer_fixup_free(void *addr, enum debug_obj_state state)
|
|||||||
* fixup_assert_init is called when:
|
* fixup_assert_init is called when:
|
||||||
* - an untracked/uninit-ed object is found
|
* - an untracked/uninit-ed object is found
|
||||||
*/
|
*/
|
||||||
static int timer_fixup_assert_init(void *addr, enum debug_obj_state state)
|
static bool timer_fixup_assert_init(void *addr, enum debug_obj_state state)
|
||||||
{
|
{
|
||||||
struct timer_list *timer = addr;
|
struct timer_list *timer = addr;
|
||||||
|
|
||||||
@ -584,13 +584,13 @@ static int timer_fixup_assert_init(void *addr, enum debug_obj_state state)
|
|||||||
* is tracked in the object tracker.
|
* is tracked in the object tracker.
|
||||||
*/
|
*/
|
||||||
debug_object_init(timer, &timer_debug_descr);
|
debug_object_init(timer, &timer_debug_descr);
|
||||||
return 0;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
setup_timer(timer, stub_timer, 0);
|
setup_timer(timer, stub_timer, 0);
|
||||||
return 1;
|
return true;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return 0;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user