Skip to content

Commit c62018a

Browse files
committed
drm/i915/pmu: Rename cpuhp_slot to cpuhp_state
Both the documentation and most of other users call the return of cpuhp_setup_state_multi() as "state". Follow that. Reviewed-by: Matt Roper <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Lucas De Marchi <[email protected]>
1 parent b7cfe79 commit c62018a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/gpu/drm/i915/i915_pmu.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@ static int i915_pmu_cpu_offline(unsigned int cpu, struct hlist_node *node)
12181218
return 0;
12191219
}
12201220

1221-
static enum cpuhp_state cpuhp_slot = CPUHP_INVALID;
1221+
static enum cpuhp_state cpuhp_state = CPUHP_INVALID;
12221222

12231223
int i915_pmu_init(void)
12241224
{
@@ -1232,28 +1232,28 @@ int i915_pmu_init(void)
12321232
pr_notice("Failed to setup cpuhp state for i915 PMU! (%d)\n",
12331233
ret);
12341234
else
1235-
cpuhp_slot = ret;
1235+
cpuhp_state = ret;
12361236

12371237
return 0;
12381238
}
12391239

12401240
void i915_pmu_exit(void)
12411241
{
1242-
if (cpuhp_slot != CPUHP_INVALID)
1243-
cpuhp_remove_multi_state(cpuhp_slot);
1242+
if (cpuhp_state != CPUHP_INVALID)
1243+
cpuhp_remove_multi_state(cpuhp_state);
12441244
}
12451245

12461246
static int i915_pmu_register_cpuhp_state(struct i915_pmu *pmu)
12471247
{
1248-
if (cpuhp_slot == CPUHP_INVALID)
1248+
if (cpuhp_state == CPUHP_INVALID)
12491249
return -EINVAL;
12501250

1251-
return cpuhp_state_add_instance(cpuhp_slot, &pmu->cpuhp.node);
1251+
return cpuhp_state_add_instance(cpuhp_state, &pmu->cpuhp.node);
12521252
}
12531253

12541254
static void i915_pmu_unregister_cpuhp_state(struct i915_pmu *pmu)
12551255
{
1256-
cpuhp_state_remove_instance(cpuhp_slot, &pmu->cpuhp.node);
1256+
cpuhp_state_remove_instance(cpuhp_state, &pmu->cpuhp.node);
12571257
}
12581258

12591259
void i915_pmu_register(struct drm_i915_private *i915)

0 commit comments

Comments
 (0)