Module Name: src Committed By: martin Date: Fri Oct 25 21:42:30 UTC 2013
Modified Files: src/sys/arch/mac68k/nubus: grf_nubus.c Log Message: Simplify To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/arch/mac68k/nubus/grf_nubus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/mac68k/nubus/grf_nubus.c diff -u src/sys/arch/mac68k/nubus/grf_nubus.c:1.76 src/sys/arch/mac68k/nubus/grf_nubus.c:1.77 --- src/sys/arch/mac68k/nubus/grf_nubus.c:1.76 Sat Oct 27 17:17:59 2012 +++ src/sys/arch/mac68k/nubus/grf_nubus.c Fri Oct 25 21:42:30 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: grf_nubus.c,v 1.76 2012/10/27 17:17:59 chs Exp $ */ +/* $NetBSD: grf_nubus.c,v 1.77 2013/10/25 21:42:30 martin Exp $ */ /* * Copyright (c) 1995 Allen Briggs. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: grf_nubus.c,v 1.76 2012/10/27 17:17:59 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grf_nubus.c,v 1.77 2013/10/25 21:42:30 martin Exp $"); #include <sys/param.h> @@ -628,9 +628,8 @@ static void grfmv_intr_supermacgfx(void *vsc) { struct grfbus_softc *sc = (struct grfbus_softc *)vsc; - u_int8_t dummy; - dummy = bus_space_read_1(sc->sc_tag, sc->sc_handle, 0xE70D3); + bus_space_read_1(sc->sc_tag, sc->sc_handle, 0xE70D3); } /* @@ -641,10 +640,9 @@ static void grfmv_intr_cmax(void *vsc) { struct grfbus_softc *sc = (struct grfbus_softc *)vsc; - u_int32_t dummy; - dummy = bus_space_read_4(sc->sc_tag, sc->sc_handle, 0xf501c); - dummy = bus_space_read_4(sc->sc_tag, sc->sc_handle, 0xf5018); + bus_space_read_4(sc->sc_tag, sc->sc_handle, 0xf501c); + bus_space_read_4(sc->sc_tag, sc->sc_handle, 0xf5018); } /* @@ -670,10 +668,9 @@ static void grfmv_intr_formac(void *vsc) { struct grfbus_softc *sc = (struct grfbus_softc *)vsc; - u_int8_t dummy; - dummy = bus_space_read_1(sc->sc_tag, sc->sc_handle, 0xde80db); - dummy = bus_space_read_1(sc->sc_tag, sc->sc_handle, 0xde80d3); + bus_space_read_1(sc->sc_tag, sc->sc_handle, 0xde80db); + bus_space_read_1(sc->sc_tag, sc->sc_handle, 0xde80d3); } /* @@ -697,9 +694,8 @@ static void grfmv_intr_gvimage(void *vsc) { struct grfbus_softc *sc = (struct grfbus_softc *)vsc; - u_int8_t dummy; - dummy = bus_space_read_1(sc->sc_tag, sc->sc_handle, 0xf00000); + bus_space_read_1(sc->sc_tag, sc->sc_handle, 0xf00000); } /* @@ -710,9 +706,8 @@ static void grfmv_intr_radius_gsc(void *vsc) { struct grfbus_softc *sc = (struct grfbus_softc *)vsc; - u_int8_t dummy; - dummy = bus_space_read_1(sc->sc_tag, sc->sc_handle, 0xfb802); + bus_space_read_1(sc->sc_tag, sc->sc_handle, 0xfb802); bus_space_write_1(sc->sc_tag, sc->sc_handle, 0xfb802, 0xff); } @@ -737,10 +732,9 @@ static void grfmv_intr_relax_200(void *vsc) { struct grfbus_softc *sc = (struct grfbus_softc *)vsc; - unsigned long scratch; /* The board ROM driver code has a tst.l here. */ - scratch = bus_space_read_4(sc->sc_tag, sc->sc_handle, 0x000D0040); + bus_space_read_4(sc->sc_tag, sc->sc_handle, 0x000D0040); } /* @@ -764,9 +758,8 @@ static void grfmv_intr_viltro_340(void *vsc) { struct grfbus_softc *sc = (struct grfbus_softc *)vsc; - u_int8_t scratch; /* Yes, two read accesses to the same spot. */ - scratch = bus_space_read_1(sc->sc_tag, sc->sc_handle, 0x0500); - scratch = bus_space_read_1(sc->sc_tag, sc->sc_handle, 0x0500); + bus_space_read_1(sc->sc_tag, sc->sc_handle, 0x0500); + bus_space_read_1(sc->sc_tag, sc->sc_handle, 0x0500); }