Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/broadcom Fix build if NBCMDMAC is zero



details:   https://anonhg.NetBSD.org/src/rev/95fe5168f435
branches:  trunk
changeset: 1013440:95fe5168f435
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Aug 28 13:13:55 2020 +0000

description:
Fix build if NBCMDMAC is zero

diffstat:

 sys/arch/arm/broadcom/bcm2835_emmc.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 5ab7f5b75391 -r 95fe5168f435 sys/arch/arm/broadcom/bcm2835_emmc.c
--- a/sys/arch/arm/broadcom/bcm2835_emmc.c      Fri Aug 28 13:00:29 2020 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_emmc.c      Fri Aug 28 13:13:55 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm2835_emmc.c,v 1.37 2020/05/31 23:52:19 thorpej Exp $        */
+/*     $NetBSD: bcm2835_emmc.c,v 1.38 2020/08/28 13:13:55 skrll Exp $  */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.37 2020/05/31 23:52:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.38 2020/08/28 13:13:55 skrll Exp $");
 
 #include "bcmdmac.h"
 
@@ -118,11 +118,8 @@
        struct bcmemmc_softc *sc = device_private(self);
        struct fdt_attach_args * const faa = aux;
        const int phandle = faa->faa_phandle;
-       enum bcmemmc_type type;
        int error;
 
-       type = of_search_compatible(phandle, compat_data)->data;
-
        sc->sc.sc_dev = self;
        sc->sc.sc_dmat = faa->faa_dmat;
        sc->sc.sc_flags = 0;
@@ -186,6 +183,8 @@
        aprint_normal_dev(self, "interrupting on %s\n", intrstr);
 
 #if NBCMDMAC > 0
+       enum bcmemmc_type type = of_search_compatible(phandle, compat_data)->data;
+
        if (type != BCM2835_SDHCI)
                goto done;
 



Home | Main Index | Thread Index | Old Index