Commit c01f2a5f authored by Thomas Richter's avatar Thomas Richter Committed by Vasily Gorbik
Browse files

s390/cpum_cf: simplify pr_err() statement in cpumf_pmu_enable/disable 



Simplify pr_err() statement into one line and omit return statement.

No functional change.

Signed-off-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Acked-by: default avatarSumanth Korikkar <sumanthk@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent b3e0423c

arch/s390/kernel/perf_cpum_cf.c

+8 −14
Original line number Diff line number Diff line
@@ -471,12 +471,9 @@ static void cpumf_pmu_enable(struct pmu *pmu) 
		return;



	err = lcctl(cpuhw->state | cpuhw->dev_state);

	if (err) {

		pr_err("Enabling the performance measuring unit "

		       "failed with rc=%x\n", err);

		return;

	}



	if (err)

		pr_err("Enabling the performance measuring unit failed with rc=%x\n", err);

	else

		cpuhw->flags |= PMU_F_ENABLED;

}
@@ -497,12 +494,9 @@ static void cpumf_pmu_disable(struct pmu *pmu) 
	inactive = cpuhw->state & ~((1 << CPUMF_LCCTL_ENABLE_SHIFT) - 1);

	inactive |= cpuhw->dev_state;

	err = lcctl(inactive);

	if (err) {

		pr_err("Disabling the performance measuring unit "

		       "failed with rc=%x\n", err);

		return;

	}



	if (err)

		pr_err("Disabling the performance measuring unit failed with rc=%x\n", err);

	else

		cpuhw->flags &= ~PMU_F_ENABLED;

}