[src/netbsd-7]: src/sys Pull up following revision(s) (requested by skrll in ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e9799a504163
branches:  netbsd-7
changeset: 798767:e9799a504163
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jan 02 20:24:14 2015 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #365):
        sys/dev/ic/dm9000.c: revision 1.5
        sys/arch/arm/s3c2xx0/s3c2440_sdi.c: revision 1.3
Appease gcc 4.8 - from Greg Willatt in private email.

diffstat:

 sys/arch/arm/s3c2xx0/s3c2440_sdi.c |  7 ++++---
 sys/dev/ic/dm9000.c                |  5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r 63d25ea3568d -r e9799a504163 sys/arch/arm/s3c2xx0/s3c2440_sdi.c
--- a/sys/arch/arm/s3c2xx0/s3c2440_sdi.c        Fri Jan 02 19:00:17 2015 +0000
+++ b/sys/arch/arm/s3c2xx0/s3c2440_sdi.c        Fri Jan 02 20:24:14 2015 +0000
@@ -384,7 +384,9 @@
        struct sssdi_softc *sc = (struct sssdi_softc*)sch;
        uint32_t cmd_control;
        int status = 0;
+#ifdef SSSDI_DEBUG
        uint32_t data_status;
+#endif
        int transfer = SSSDI_TRANSFER_NONE;
        dmac_xfer_t xfer;
 
@@ -566,8 +568,8 @@
        DPRINTF(("Remaining Block Number          : %d\n",
                 SDIDATCNT_BLK_NUM_CNT(status)));
 
+#ifdef SSSDI_DEBUG
        data_status = bus_space_read_4(sc->iot, sc->ioh, SDI_DAT_STA);
-#ifdef SSSDI_DEBUG
        printf("SDI Data Status Register Before xfer: 0x%X\n", data_status);
 #endif
        if (transfer == SSSDI_TRANSFER_READ) {
@@ -646,7 +648,6 @@
 
 void sssdi_perform_pio_read(struct sssdi_softc *sc, struct sdmmc_command *cmd)
 {
-       uint32_t status;
        uint32_t fifo_status;
        int count;
        uint32_t written;
@@ -657,7 +658,7 @@
        while (written < cmd->c_datalen ) {
                /* Wait until the FIFO is full or has the final data.
                   In the latter case it might not get filled. */
-               status = sssdi_wait_intr(sc, SDI_FIFO_RX_FULL | SDI_FIFO_RX_LAST, 1000);
+               sssdi_wait_intr(sc, SDI_FIFO_RX_FULL | SDI_FIFO_RX_LAST, 1000);
 
                fifo_status = bus_space_read_4(sc->iot, sc->ioh, SDI_DAT_FSTA);
                count = SDIDATFSTA_FFCNT(fifo_status);
diff -r 63d25ea3568d -r e9799a504163 sys/dev/ic/dm9000.c
--- a/sys/dev/ic/dm9000.c       Fri Jan 02 19:00:17 2015 +0000
+++ b/sys/dev/ic/dm9000.c       Fri Jan 02 20:24:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dm9000.c,v 1.4 2012/01/28 08:29:55 nisimura Exp $      */
+/*     $NetBSD: dm9000.c,v 1.4.22.1 2015/01/02 20:24:14 martin Exp $   */
 
 /*
  * Copyright (c) 2009 Paul Fleischer
@@ -762,7 +762,6 @@
 void
 dme_transmit(struct dme_softc *sc)
 {
-       uint8_t status;
 
        TX_DPRINTF(("dme_transmit: PRE: txready: %d, txbusy: %d\n",
                sc->txready, sc->txbusy));
@@ -771,7 +770,7 @@
        dme_write(sc, DM9000_TXPLH, (sc->txready_length >> 8) & 0xff );
 
        /* Request to send the packet */
-       status = dme_read(sc, DM9000_ISR);
+       dme_read(sc, DM9000_ISR);
 
        dme_write(sc, DM9000_TCR, DM9000_TCR_TXREQ);