From 839f0f144d2e4eb40ac77b273b44d137b848f209 Mon Sep 17 00:00:00 2001 From: skrll Date: Wed, 26 Nov 2014 22:50:22 +0000 Subject: [PATCH] Appease gcc 4.8 - from Greg Willatt in private email. --- sys/arch/arm/s3c2xx0/s3c2440_sdi.c | 7 ++++--- sys/dev/ic/dm9000.c | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arch/arm/s3c2xx0/s3c2440_sdi.c b/sys/arch/arm/s3c2xx0/s3c2440_sdi.c index 43f6bee80b92..3b565743d7d9 100644 --- a/sys/arch/arm/s3c2xx0/s3c2440_sdi.c +++ b/sys/arch/arm/s3c2xx0/s3c2440_sdi.c @@ -384,7 +384,9 @@ sssdi_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd) 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 @@ sssdi_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd) DPRINTF(("Remaining Block Number : %d\n", SDIDATCNT_BLK_NUM_CNT(status))); - data_status = bus_space_read_4(sc->iot, sc->ioh, SDI_DAT_STA); #ifdef SSSDI_DEBUG + data_status = bus_space_read_4(sc->iot, sc->ioh, SDI_DAT_STA); printf("SDI Data Status Register Before xfer: 0x%X\n", data_status); #endif if (transfer == SSSDI_TRANSFER_READ) { @@ -646,7 +648,6 @@ sssdi_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd) 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 @@ void sssdi_perform_pio_read(struct sssdi_softc *sc, struct sdmmc_command *cmd) 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 --git a/sys/dev/ic/dm9000.c b/sys/dev/ic/dm9000.c index 7b8f7afd3358..39a5a710f1f5 100644 --- a/sys/dev/ic/dm9000.c +++ b/sys/dev/ic/dm9000.c @@ -1,4 +1,4 @@ -/* $NetBSD: dm9000.c,v 1.4 2012/01/28 08:29:55 nisimura Exp $ */ +/* $NetBSD: dm9000.c,v 1.5 2014/11/26 22:50:22 skrll Exp $ */ /* * Copyright (c) 2009 Paul Fleischer @@ -762,7 +762,6 @@ dme_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr) 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_transmit(struct dme_softc *sc) 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);