Module Name: src
Committed By: thorpej
Date: Wed May 19 13:23:23 UTC 2021
Modified Files:
src/sys/dev/spi [thorpej-i2c-spi-conf]: mcp23s17.c
Log Message:
Oops, fix 2 paste-o's.
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.4 -r1.2.2.5 src/sys/dev/spi/mcp23s17.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/spi/mcp23s17.c
diff -u src/sys/dev/spi/mcp23s17.c:1.2.2.4 src/sys/dev/spi/mcp23s17.c:1.2.2.5
--- src/sys/dev/spi/mcp23s17.c:1.2.2.4 Wed May 19 12:37:46 2021
+++ src/sys/dev/spi/mcp23s17.c Wed May 19 13:23:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mcp23s17.c,v 1.2.2.4 2021/05/19 12:37:46 thorpej Exp $ */
+/* $NetBSD: mcp23s17.c,v 1.2.2.5 2021/05/19 13:23:23 thorpej Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcp23s17.c,v 1.2.2.4 2021/05/19 12:37:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcp23s17.c,v 1.2.2.5 2021/05/19 13:23:23 thorpej Exp $");
/*
* Driver for Microchip MCP23S17 GPIO
@@ -204,7 +204,7 @@ mcp23s17gpio_attach(device_t parent, dev
/* Error alredy displayed. */
return;
}
- return;
+ break;
#endif /* FDT */
default:
aprint_error(": unsupported device handle type\n");
@@ -212,12 +212,6 @@ mcp23s17gpio_attach(device_t parent, dev
}
}
- /*
- * XXX Initialize sc_ha from microchip,spi-present-mask
- * XXX property for FDT. Only consult cf_flags for indirect.
- */
- sc->sc_ha = device_cfdata(sc->sc_dev)->cf_flags & 0x7;
-
aprint_naive(": GPIO\n");
aprint_normal(": MCP23S17 GPIO (ha=%d)\n", sc->sc_ha);
