CVS commit: src/sys/arch/arm/altera

[Aymeric Vincent]

Module Name:    src
Committed By:   aymeric
Date:           Mon May 20 20:14:08 UTC 2019

Modified Files:
        src/sys/arch/arm/altera: cycv_dwcmmc.c

Log Message:
use NULL instead of cycv_dwcmmc_card_detect() for sc_card_detect.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/altera/cycv_dwcmmc.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/arch/arm/altera/cycv_dwcmmc.c
diff -u src/sys/arch/arm/altera/cycv_dwcmmc.c:1.1 src/sys/arch/arm/altera/cycv_dwcmmc.c:1.2
--- src/sys/arch/arm/altera/cycv_dwcmmc.c:1.1	Wed Sep 19 17:31:38 2018
+++ src/sys/arch/arm/altera/cycv_dwcmmc.c	Mon May 20 20:14:08 2019
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: cycv_dwcmmc.
 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 @@ cycv_dwcmmc_attach(device_t parent, devi
 	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 @@ cycv_dwcmmc_attach(device_t parent, devi
 	}
 	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;
-}