summaryrefslogtreecommitdiffstats
path: root/sys/isa
diff options
context:
space:
mode:
authorjoerg <joerg@FreeBSD.org>2002-05-13 10:28:20 +0000
committerjoerg <joerg@FreeBSD.org>2002-05-13 10:28:20 +0000
commitf3653f3da85e17701bd60340a6a015bdcacb446f (patch)
tree84b854118f8a035a5eb9692b18dc2e451efa34e4 /sys/isa
parentf172dc1bd4202a6603656f6ba3482f3c32938fe4 (diff)
downloadFreeBSD-src-f3653f3da85e17701bd60340a6a015bdcacb446f.zip
FreeBSD-src-f3653f3da85e17701bd60340a6a015bdcacb446f.tar.gz
style(9) changes before further editing that region:
. add unnecessary parenthesis around return values . put body of an "if" statement onto a line of its own
Diffstat (limited to 'sys/isa')
-rw-r--r--sys/isa/fd.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index fd838ad..60fff67 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -1490,7 +1490,7 @@ fd_in(struct fdc_data *fdc, int *ptr)
while ((i = fdsts_rd(fdc) & (NE7_DIO|NE7_RQM))
!= (NE7_DIO|NE7_RQM) && j-- > 0) {
if (i == NE7_RQM)
- return fdc_err(fdc, "ready for output in input\n");
+ return (fdc_err(fdc, "ready for output in input\n"));
/*
* After (maybe) 1 msec of waiting, back off to larger
* stepping to get the timing more accurate.
@@ -1502,17 +1502,17 @@ fd_in(struct fdc_data *fdc, int *ptr)
DELAY(1);
}
if (j <= 0)
- return fdc_err(fdc, bootverbose? "input ready timeout\n": 0);
+ return (fdc_err(fdc, bootverbose? "input ready timeout\n": 0));
#ifdef FDC_DEBUG
i = fddata_rd(fdc);
TRACE1("[FDDATA->0x%x]", (unsigned char)i);
*ptr = i;
- return 0;
+ return (0);
#else /* !FDC_DEBUG */
i = fddata_rd(fdc);
if (ptr)
*ptr = i;
- return 0;
+ return (0);
#endif /* FDC_DEBUG */
}
@@ -1533,7 +1533,8 @@ out_fdc(struct fdc_data *fdc, int x)
i -= 999;
} else
DELAY(1);
- if (i <= 0) return fdc_err(fdc, "direction bit not set\n");
+ if (i <= 0)
+ return (fdc_err(fdc, "direction bit not set\n"));
/* Check that the floppy controller is ready for a command */
i = FDSTS_TIMEOUT;
@@ -1548,7 +1549,7 @@ out_fdc(struct fdc_data *fdc, int x)
} else
DELAY(1);
if (i <= 0)
- return fdc_err(fdc, bootverbose? "output ready timeout\n": 0);
+ return (fdc_err(fdc, bootverbose? "output ready timeout\n": 0));
/* Send the command and return */
fddata_wr(fdc, x);
OpenPOWER on IntegriCloud