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

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
...@@ -471,13 +471,10 @@ static void cpumf_pmu_enable(struct pmu *pmu) ...@@ -471,13 +471,10 @@ static void cpumf_pmu_enable(struct pmu *pmu)
return; return;
err = lcctl(cpuhw->state | cpuhw->dev_state); err = lcctl(cpuhw->state | cpuhw->dev_state);
if (err) { if (err)
pr_err("Enabling the performance measuring unit " pr_err("Enabling the performance measuring unit failed with rc=%x\n", err);
"failed with rc=%x\n", err); else
return; cpuhw->flags |= PMU_F_ENABLED;
}
cpuhw->flags |= PMU_F_ENABLED;
} }
/* /*
...@@ -497,13 +494,10 @@ static void cpumf_pmu_disable(struct pmu *pmu) ...@@ -497,13 +494,10 @@ static void cpumf_pmu_disable(struct pmu *pmu)
inactive = cpuhw->state & ~((1 << CPUMF_LCCTL_ENABLE_SHIFT) - 1); inactive = cpuhw->state & ~((1 << CPUMF_LCCTL_ENABLE_SHIFT) - 1);
inactive |= cpuhw->dev_state; inactive |= cpuhw->dev_state;
err = lcctl(inactive); err = lcctl(inactive);
if (err) { if (err)
pr_err("Disabling the performance measuring unit " pr_err("Disabling the performance measuring unit failed with rc=%x\n", err);
"failed with rc=%x\n", err); else
return; cpuhw->flags &= ~PMU_F_ENABLED;
}
cpuhw->flags &= ~PMU_F_ENABLED;
} }
#define PMC_INIT 0UL #define PMC_INIT 0UL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment