Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/altera use NULL instead of cycv_dwcmmc_card_det...



details:   https://anonhg.NetBSD.org/src/rev/789619839ea3
branches:  trunk
changeset: 999125:789619839ea3
user:      aymeric <aymeric%NetBSD.org@localhost>
date:      Mon May 20 20:14:08 2019 +0000

description:
use NULL instead of cycv_dwcmmc_card_detect() for sc_card_detect.

diffstat:

 sys/arch/arm/altera/cycv_dwcmmc.c |  16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)

diffs (48 lines):

diff -r 70d93d322c9e -r 789619839ea3 sys/arch/arm/altera/cycv_dwcmmc.c
--- a/sys/arch/arm/altera/cycv_dwcmmc.c Mon May 20 18:24:57 2019 +0000
+++ b/sys/arch/arm/altera/cycv_dwcmmc.c Mon May 20 20:14:08 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_dwcmmc.c,v 1.1 2018/09/19 17:31:38 aymeric Exp $ */
+/* $NetBSD: cycv_dwcmmc.c,v 1.2 2019/05/20 20:14:08 aymeric Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_dwcmmc.c,v 1.1 2018/09/19 17:31:38 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_dwcmmc.c,v 1.2 2019/05/20 20:14:08 aymeric Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -47,8 +47,6 @@
 static int     cycv_dwcmmc_match(device_t, cfdata_t, void *);
 static void    cycv_dwcmmc_attach(device_t, device_t, void *);
 
-static int     cycv_dwcmmc_card_detect(struct dwc_mmc_softc *);
-
 struct cycv_dwcmmc_softc {
        struct dwc_mmc_softc    sc;
        struct clk              *sc_clk_biu;
@@ -130,7 +128,7 @@
        sc->sc_fifo_reg = FIFO_REG;
        sc->sc_flags = DWC_MMC_F_USE_HOLD_REG | DWC_MMC_F_DMA;
 
-       sc->sc_card_detect = cycv_dwcmmc_card_detect;
+       sc->sc_card_detect = NULL;
        sc->sc_write_protect = NULL;
 
        aprint_naive("\n");
@@ -153,11 +151,3 @@
        }
        aprint_normal_dev(self, "interrupting on %s\n", intrstr);
 }
-
-static int
-cycv_dwcmmc_card_detect(struct dwc_mmc_softc *sc)
-{
-       /* Card detection is broken on the nanosoc. Pretend it's present. */
-
-       return 0;
-}



Home | Main Index | Thread Index | Old Index