lkml.org 
[lkml]   [2020]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 081/119] intel_th: msu: Fix the unexpected state warning
    Date
    From: Alexander Shishkin <alexander.shishkin@linux.intel.com>

    commit 885f123554bbdc1807ca25a374be6e9b3bddf4de upstream.

    The unexpected state warning should only warn on illegal state
    transitions. Fix that.

    Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Fixes: 615c164da0eb4 ("intel_th: msu: Introduce buffer interface")
    Cc: stable@vger.kernel.org # v5.4+
    Link: https://lore.kernel.org/r/20200317062215.15598-5-alexander.shishkin@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/hwtracing/intel_th/msu.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    --- a/drivers/hwtracing/intel_th/msu.c
    +++ b/drivers/hwtracing/intel_th/msu.c
    @@ -718,9 +718,6 @@ static int msc_win_set_lockout(struct ms

    if (old != expect) {
    ret = -EINVAL;
    - dev_warn_ratelimited(msc_dev(win->msc),
    - "expected lockout state %d, got %d\n",
    - expect, old);
    goto unlock;
    }

    @@ -741,6 +738,10 @@ unlock:
    /* from intel_th_msc_window_unlock(), don't warn if not locked */
    if (expect == WIN_LOCKED && old == new)
    return 0;
    +
    + dev_warn_ratelimited(msc_dev(win->msc),
    + "expected lockout state %d, got %d\n",
    + expect, old);
    }

    return ret;

    \
     
     \ /
      Last update: 2020-03-24 14:25    [W:4.019 / U:1.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site