[src/thorpej-i2c-spi-conf]: src/sys/dev/spi Oops, fix 2 paste-o's.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d7a1cd243eb2
branches:  thorpej-i2c-spi-conf
changeset: 378804:d7a1cd243eb2
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed May 19 13:23:23 2021 +0000

description:
Oops, fix 2 paste-o's.

diffstat:

 sys/dev/spi/mcp23s17.c |  12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diffs (40 lines):

diff -r 948b598f43ce -r d7a1cd243eb2 sys/dev/spi/mcp23s17.c
--- a/sys/dev/spi/mcp23s17.c    Wed May 19 12:37:46 2021 +0000
+++ b/sys/dev/spi/mcp23s17.c    Wed May 19 13:23:23 2021 +0000
@@ -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);