diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index a3d424bd58cae7..72861320c91e05 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -4551,21 +4551,21 @@ static struct cftype cgroup_base_files[] = {
 		.seq_show = cpu_stat_show,
 	},
 #ifdef CONFIG_PSI
-       {
-               .name = "cpu.pressure",
-               .flags = CFTYPE_NOT_ON_ROOT,
-               .seq_show = cgroup_cpu_pressure_show,
-       },
-       {
-               .name = "memory.pressure",
-               .flags = CFTYPE_NOT_ON_ROOT,
-               .seq_show = cgroup_memory_pressure_show,
-       },
-       {
-               .name = "io.pressure",
-               .flags = CFTYPE_NOT_ON_ROOT,
-               .seq_show = cgroup_io_pressure_show,
-       },
+	{
+		.name = "cpu.pressure",
+		.flags = CFTYPE_NOT_ON_ROOT,
+		.seq_show = cgroup_cpu_pressure_show,
+	},
+	{
+		.name = "memory.pressure",
+		.flags = CFTYPE_NOT_ON_ROOT,
+		.seq_show = cgroup_memory_pressure_show,
+	},
+	{
+		.name = "io.pressure",
+		.flags = CFTYPE_NOT_ON_ROOT,
+		.seq_show = cgroup_io_pressure_show,
+	},
 #endif
 	{ }	/* terminate */
 };
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index b74c6bc5bf1e52..390e7476f57d7c 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -422,15 +422,15 @@ void psi_task_change(struct task_struct *task, u64 now, int clear, int set)
 	psi_group_change(&psi_system, cpu, now, clear, set);
 
 #ifdef CONFIG_CGROUPS
-       cgroup = task->cgroups->dfl_cgrp;
-       while (cgroup && (parent = cgroup_parent(cgroup))) {
-               struct psi_group *group;
+	cgroup = task->cgroups->dfl_cgrp;
+	while (cgroup && (parent = cgroup_parent(cgroup))) {
+		struct psi_group *group;
 
-               group = cgroup_psi(cgroup);
-               psi_group_change(group, cpu, now, clear, set);
+		group = cgroup_psi(cgroup);
+		psi_group_change(group, cpu, now, clear, set);
 
-               cgroup = parent;
-       }
+		cgroup = parent;
+	}
 #endif
 }
 
@@ -535,11 +535,10 @@ void cgroup_move_task(struct task_struct *task, struct css_set *to)
 
 	rq = task_rq_lock(task, &rf);
 
-	if (task_on_rq_queued(task)) {
+	if (task_on_rq_queued(task))
 		task_flags = TSK_RUNNING;
-	} else if (task->in_iowait) {
+	else if (task->in_iowait)
 		task_flags = TSK_IOWAIT;
-	}
 	if (task->flags & PF_MEMSTALL)
 		task_flags |= TSK_MEMSTALL;