summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2008-09-29 18:05:26 +0000
committerimp <imp@FreeBSD.org>2008-09-29 18:05:26 +0000
commit8a3e9c9a9da63419ccead8baff4e381e17f48bb9 (patch)
tree537d3ec3dcf4e3ad1eee058a7133a5c8e50112cf
parent679a0ae405d6b9dd914f295119a9279e67da9d3b (diff)
downloadFreeBSD-src-8a3e9c9a9da63419ccead8baff4e381e17f48bb9.zip
FreeBSD-src-8a3e9c9a9da63419ccead8baff4e381e17f48bb9.tar.gz
Conform to style(9) for return (foo); The files were a mix before.
Submitted by: mav@
-rw-r--r--sys/dev/mmc/mmc.c18
-rw-r--r--sys/dev/mmc/mmcsd.c6
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c
index ed5cad5..831a943 100644
--- a/sys/dev/mmc/mmc.c
+++ b/sys/dev/mmc/mmc.c
@@ -152,7 +152,7 @@ mmc_detach(device_t dev)
/* kill children [ph33r]. -sorbo */
if (device_get_children(sc->dev, &kids, &nkid) != 0)
- return 0;
+ return (0);
for (i = 0; i < nkid; i++) {
device_t kid = kids[i];
void *ivar = device_get_ivars(kid);
@@ -166,7 +166,7 @@ mmc_detach(device_t dev)
MMC_LOCK_DESTROY(sc);
- return 0;
+ return (0);
}
static int
@@ -248,7 +248,7 @@ static uint32_t
mmc_select_vdd(struct mmc_softc *sc, uint32_t ocr)
{
- return ocr & MMC_OCR_VOLTAGE;
+ return (ocr & MMC_OCR_VOLTAGE);
}
static int
@@ -258,7 +258,7 @@ mmc_highest_voltage(uint32_t ocr)
for (i = 30; i >= 0; i--)
if (ocr & (1 << i))
- return i;
+ return (i);
return (-1);
}
@@ -299,7 +299,7 @@ mmc_wait_for_request(device_t brdev, device_t reqdev, struct mmc_request *req)
{
struct mmc_softc *sc = device_get_softc(brdev);
- return mmc_wait_for_req(sc, req);
+ return (mmc_wait_for_req(sc, req));
}
static int
@@ -412,7 +412,7 @@ mmc_send_app_op_cond(struct mmc_softc *sc, uint32_t ocr, uint32_t *rocr)
}
if (rocr && err == MMC_ERR_NONE)
*rocr = cmd.resp[0];
- return err;
+ return (err);
}
static int
@@ -437,7 +437,7 @@ mmc_send_op_cond(struct mmc_softc *sc, uint32_t ocr, uint32_t *rocr)
}
if (rocr && err == MMC_ERR_NONE)
*rocr = cmd.resp[0];
- return err;
+ return (err);
}
static void
@@ -482,7 +482,7 @@ mmc_get_bits(uint32_t *bits, int start, int size)
uint32_t retval = bits[i] >> shift;
if (size + shift > 32)
retval |= bits[i - 1] << (32 - shift);
- return retval & ((1 << size) - 1);
+ return (retval & ((1 << size) - 1));
}
static void
@@ -719,7 +719,7 @@ mmc_calculate_clock(struct mmc_softc *sc)
free(kids, M_TEMP);
device_printf(sc->dev, "setting transfer rate to %d.%03dMHz\n",
max_dtr / 1000000, (max_dtr / 1000) % 1000);
- return max_dtr;
+ return (max_dtr);
}
static void
diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c
index 0c7eeca..5e60869 100644
--- a/sys/dev/mmc/mmcsd.c
+++ b/sys/dev/mmc/mmcsd.c
@@ -162,19 +162,19 @@ mmcsd_detach(device_t dev)
MMCSD_LOCK_DESTROY(sc);
- return 0;
+ return (0);
}
static int
mmcsd_open(struct disk *dp)
{
- return 0;
+ return (0);
}
static int
mmcsd_close(struct disk *dp)
{
- return 0;
+ return (0);
}
static void
OpenPOWER on IntegriCloud