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: Thomas Richter <tmricht@linux.ibm.com>
Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index 4c158faa3075c637b3774851479dec5530ad8fb4..96b581967334dc7d76b19e3012fe4874d1c7a0ac 100644 (file)
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -471,13 +471,10 @@ 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;
-       }
-
-       cpuhw->flags |= PMU_F_ENABLED;
+       if (err)
+               pr_err("Enabling the performance measuring unit failed with rc=%x\n", err);
+       else
+               cpuhw->flags |= PMU_F_ENABLED;
 }
 
 /*
@@ -497,13 +494,10 @@ 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;
-       }
-
-       cpuhw->flags &= ~PMU_F_ENABLED;
+       if (err)
+               pr_err("Disabling the performance measuring unit failed with rc=%x\n", err);
+       else
+               cpuhw->flags &= ~PMU_F_ENABLED;
 }
 
 #define PMC_INIT      0UL