git: 05d3c5fd182e - main - fd_probe: only define unit on x86, other platforms don't use this code
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 05 Apr 2022 04:32:14 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=05d3c5fd182eeb33075ee14e2802c94882dc2c41
commit 05d3c5fd182eeb33075ee14e2802c94882dc2c41
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-04-05 00:03:54 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-04-05 04:29:28 +0000
fd_probe: only define unit on x86, other platforms don't use this code
Sponsored by: Netflix
---
sys/dev/fdc/fdc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index b427e919add1..5c78d02a5502 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -1887,7 +1887,9 @@ fdc_print_child(device_t me, device_t child)
static int
fd_probe(device_t dev)
{
+#if defined(__i386__) || defined(__amd64__)
int unit;
+#endif
int i;
u_int st0, st3;
struct fd_data *fd;
@@ -1903,7 +1905,6 @@ fd_probe(device_t dev)
fd->dev = dev;
fd->fdc = fdc;
fd->fdsu = fdsu;
- unit = device_get_unit(dev);
/* Auto-probe if fdinfo is present, but always allow override. */
type = flags & FD_TYPEMASK;
@@ -1917,6 +1918,7 @@ fd_probe(device_t dev)
}
#if defined(__i386__) || defined(__amd64__)
+ unit = device_get_unit(dev);
if (fd->type == FDT_NONE && (unit == 0 || unit == 1)) {
/* Look up what the BIOS thinks we have. */
if (unit == 0)