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

[Tobias Nygren]

Module Name:    src
Committed By:   tnn
Date:           Sun Aug  4 22:26:40 UTC 2019

Modified Files:
        src/sys/arch/arm/sunxi: sun4i_spi.c sun6i_spi.c

Log Message:
remove useless splbio() in sunxispi_start

We raised spl already in sunxispi_transfer.
XXX spi(4) should be made MPSAFE


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/sunxi/sun4i_spi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/sunxi/sun6i_spi.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/sunxi/sun4i_spi.c
diff -u src/sys/arch/arm/sunxi/sun4i_spi.c:1.2 src/sys/arch/arm/sunxi/sun4i_spi.c:1.3
--- src/sys/arch/arm/sunxi/sun4i_spi.c:1.2	Sat Aug  3 19:56:42 2019
+++ src/sys/arch/arm/sunxi/sun4i_spi.c	Sun Aug  4 22:26:40 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: sun4i_spi.c,v 1.2 2019/08/03 19:56:42 tnn Exp $	*/
+/*	$NetBSD: sun4i_spi.c,v 1.3 2019/08/04 22:26:40 tnn Exp $	*/
 
 /*
  * Copyright (c) 2019 Tobias Nygren
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun4i_spi.c,v 1.2 2019/08/03 19:56:42 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun4i_spi.c,v 1.3 2019/08/04 22:26:40 tnn Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -337,7 +337,6 @@ sun4ispi_start(struct sun4ispi_softc * c
 {
 	struct spi_transfer *st;
 	uint32_t ctl;
-	int s;
 	struct spi_chunk *chunk;
 	size_t burstcount;
 
@@ -368,13 +367,11 @@ sun4ispi_start(struct sun4ispi_softc * c
 		if (!cold)
 			return;
 
-		s = splbio();
 		for (;;) {
 			(void) sun4ispi_intr(sc);
 			if (ISSET(st->st_flags, SPI_F_DONE))
 				break;
 		}
-		splx(s);
 	}
 	sc->sc_running = false;
 }

Index: src/sys/arch/arm/sunxi/sun6i_spi.c
diff -u src/sys/arch/arm/sunxi/sun6i_spi.c:1.3 src/sys/arch/arm/sunxi/sun6i_spi.c:1.4
--- src/sys/arch/arm/sunxi/sun6i_spi.c:1.3	Sat Aug  3 14:42:24 2019
+++ src/sys/arch/arm/sunxi/sun6i_spi.c	Sun Aug  4 22:26:40 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: sun6i_spi.c,v 1.3 2019/08/03 14:42:24 tnn Exp $	*/
+/*	$NetBSD: sun6i_spi.c,v 1.4 2019/08/04 22:26:40 tnn Exp $	*/
 
 /*
  * Copyright (c) 2019 Tobias Nygren
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun6i_spi.c,v 1.3 2019/08/03 14:42:24 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun6i_spi.c,v 1.4 2019/08/04 22:26:40 tnn Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -308,13 +308,11 @@ sun6ispi_start(struct sun6ispi_softc * c
 		if (!cold)
 			return;
 
-		int s = splbio();
 		for (;;) {
 			sun6ispi_intr(sc);
 			if (ISSET(st->st_flags, SPI_F_DONE))
 				break;
 		}
-		splx(s);
 	}
 
 	sc->sc_running = false;