From 3176c2567eb1c770f0c6c493ff8833b7a05b5695 Mon Sep 17 00:00:00 2001
From: Stefan Kempf <stefan@cvs.openbsd.org>
Date: Mon, 14 Mar 2016 18:01:19 +0000
Subject: Convert sparc drivers bpp and magma to uiomove

Compile test and ok tobiasu@
---
 sys/dev/sbus/bpp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'sys/dev/sbus/bpp.c')

diff --git a/sys/dev/sbus/bpp.c b/sys/dev/sbus/bpp.c
index f03f25ca8ba..c9f22e2cf12 100644
--- a/sys/dev/sbus/bpp.c
+++ b/sys/dev/sbus/bpp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpp.c,v 1.4 2015/02/10 21:56:09 miod Exp $	*/
+/*	$OpenBSD: bpp.c,v 1.5 2016/03/14 18:01:18 stefan Exp $	*/
 /*	$NetBSD: bpp.c,v 1.25 2005/12/11 12:23:44 christos Exp $ */
 
 /*-
@@ -303,9 +303,9 @@ bppwrite(dev_t dev, struct uio *uio, int flags)
 	 */
 	while (uio->uio_resid > 0) {
 		caddr_t bp = sc->sc_buf;
-		size_t len = min(sc->sc_bufsz, uio->uio_resid);
+		size_t len = ulmin(sc->sc_bufsz, uio->uio_resid);
 
-		if ((error = uiomovei(bp, len, uio)) != 0)
+		if ((error = uiomove(bp, len, uio)) != 0)
 			break;
 
 		while (len > 0) {
@@ -315,7 +315,7 @@ bppwrite(dev_t dev, struct uio *uio, int flags)
 
 #ifdef DEBUG
 			if (bppdebug) {
-				int i;
+				size_t i;
 				printf("bpp: writing %ld : ", len);
 				for (i=0; i<len; i++) printf("%c(0x%x)", bp[i], bp[i]);
 				printf("\n");
-- 
cgit v1.2.3