Merge branch 'pm-cpuidle'

rafaeljw · rafaeljw · commit a31434bcd4cb · 2020-04-10T11:32:22.000+02:00
* pm-cpuidle:
  cpuidle-haltpoll: Fix small typo
diff --git a/drivers/cpuidle/cpuidle-haltpoll.c b/drivers/cpuidle/cpuidle-haltpoll.c
@@ -94,7 +94,7 @@ static void haltpoll_uninit(void)
 	haltpoll_cpuidle_devices = NULL;
 }
 
-static bool haltpool_want(void)
+static bool haltpoll_want(void)
 {
 	return kvm_para_has_hint(KVM_HINTS_REALTIME) || force;
 }
@@ -110,7 +110,7 @@ static int __init haltpoll_init(void)
 
 	cpuidle_poll_state_init(drv);
 
-	if (!kvm_para_available() || !haltpool_want())
+	if (!kvm_para_available() || !haltpoll_want())
 		return -ENODEV;
 
 	ret = cpuidle_register_driver(drv);

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static void haltpoll_uninit(void)`
`94`	`94`	`haltpoll_cpuidle_devices = NULL;`
`95`	`95`	`}`
`96`	`96`
`97`		`-static bool haltpool_want(void)`
	`97`	`+static bool haltpoll_want(void)`
`98`	`98`	`{`
`99`	`99`	`return kvm_para_has_hint(KVM_HINTS_REALTIME) \|\| force;`
`100`	`100`	`}`
`@@ -110,7 +110,7 @@ static int __init haltpoll_init(void)`
`110`	`110`
`111`	`111`	`cpuidle_poll_state_init(drv);`
`112`	`112`
`113`		`- if (!kvm_para_available() \|\| !haltpool_want())`
	`113`	`+ if (!kvm_para_available() \|\| !haltpoll_want())`
`114`	`114`	`return -ENODEV;`
`115`	`115`
`116`	`116`	`ret = cpuidle_register_driver(drv);`