Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e4dac32 authored by Finn Thain's avatar Finn Thain Committed by Greg Kroah-Hartman
Browse files

macintosh/via-pmu: Add missing mmio accessors 



[ 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: default avatarStan Johnson <userm57@yahoo.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d9f6cff

drivers/macintosh/via-pmu.c

+5 −4
Original line number Diff line number Diff line
@@ -527,8 +527,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;
@@ -1450,8 +1451,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;

	}