lkml.org 
[lkml]   [2018]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 17/62] macintosh/via-pmu: Add missing mmio accessors
    Date
    From: Finn Thain <fthain@telegraphics.com.au>

    [ Upstream commit 576d5290d678a651b9f36050fc1717e0573aca13 ]

    Add missing in_8() accessors to init_pmu() and pmu_sr_intr().

    This fixes several sparse warnings:
    drivers/macintosh/via-pmu.c:536:29: warning: dereference of noderef expression
    drivers/macintosh/via-pmu.c:537:33: warning: dereference of noderef expression
    drivers/macintosh/via-pmu.c:1455:17: warning: dereference of noderef expression
    drivers/macintosh/via-pmu.c:1456:69: warning: dereference of noderef expression

    Tested-by: Stan Johnson <userm57@yahoo.com>
    Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
    Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/macintosh/via-pmu.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
    index 91081dcdc272..32c696799300 100644
    --- a/drivers/macintosh/via-pmu.c
    +++ b/drivers/macintosh/via-pmu.c
    @@ -531,8 +531,9 @@ init_pmu(void)
    int timeout;
    struct adb_request req;

    - out_8(&via[B], via[B] | TREQ); /* negate TREQ */
    - out_8(&via[DIRB], (via[DIRB] | TREQ) & ~TACK); /* TACK in, TREQ out */
    + /* Negate TREQ. Set TACK to input and TREQ to output. */
    + out_8(&via[B], in_8(&via[B]) | TREQ);
    + out_8(&via[DIRB], (in_8(&via[DIRB]) | TREQ) & ~TACK);

    pmu_request(&req, NULL, 2, PMU_SET_INTR_MASK, pmu_intr_mask);
    timeout = 100000;
    @@ -1454,8 +1455,8 @@ pmu_sr_intr(void)
    struct adb_request *req;
    int bite = 0;

    - if (via[B] & TREQ) {
    - printk(KERN_ERR "PMU: spurious SR intr (%x)\n", via[B]);
    + if (in_8(&via[B]) & TREQ) {
    + printk(KERN_ERR "PMU: spurious SR intr (%x)\n", in_8(&via[B]));
    out_8(&via[IFR], SR_INT);
    return NULL;
    }
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-02 15:24    [W:3.716 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site