CVS commit: src/sys/dev/ic

[Michael van Elst]

Module Name:    src
Committed By:   mlelstv
Date:           Sat Jul 30 12:48:17 UTC 2022

Modified Files:
        src/sys/dev/ic: ld_aac.c ld_nvme.c

Log Message:
aprint_error_dev is for autoconfig messages, use device_printf instead.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/ld_aac.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/ld_nvme.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/dev/ic/ld_aac.c
diff -u src/sys/dev/ic/ld_aac.c:1.30 src/sys/dev/ic/ld_aac.c:1.31
--- src/sys/dev/ic/ld_aac.c:1.30	Tue Sep 27 03:33:32 2016
+++ src/sys/dev/ic/ld_aac.c	Sat Jul 30 12:48:17 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld_aac.c,v 1.30 2016/09/27 03:33:32 pgoyette Exp $	*/
+/*	$NetBSD: ld_aac.c,v 1.31 2022/07/30 12:48:17 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.30 2016/09/27 03:33:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.31 2022/07/30 12:48:17 mlelstv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -293,7 +293,7 @@ ld_aac_dobio(struct ld_aac_softc *sc, vo
 			}
 
 			if (status != ST_OK) {
-				aprint_error_dev(sc->sc_ld.sc_dv,
+				device_printf(sc->sc_ld.sc_dv,
 				    "I/O error: %s\n",
 				    aac_describe_code(aac_command_status_table,
 				    status));
@@ -348,7 +348,7 @@ ld_aac_intr(struct aac_ccb *ac)
 		bp->b_error = EIO;
 		bp->b_resid = bp->b_bcount;
 
-		aprint_error_dev(sc->sc_ld.sc_dv, "I/O error: %s\n",
+		device_printf(sc->sc_ld.sc_dv, "I/O error: %s\n",
 		    aac_describe_code(aac_command_status_table, status));
 	} else
 		bp->b_resid = 0;

Index: src/sys/dev/ic/ld_nvme.c
diff -u src/sys/dev/ic/ld_nvme.c:1.24 src/sys/dev/ic/ld_nvme.c:1.25
--- src/sys/dev/ic/ld_nvme.c:1.24	Tue Sep 22 11:53:10 2020
+++ src/sys/dev/ic/ld_nvme.c	Sat Jul 30 12:48:17 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld_nvme.c,v 1.24 2020/09/22 11:53:10 kardel Exp $	*/
+/*	$NetBSD: ld_nvme.c,v 1.25 2022/07/30 12:48:17 mlelstv Exp $	*/
 
 /*-
  * Copyright (C) 2016 NONAKA Kimihiro <non...@netbsd.org>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_nvme.c,v 1.24 2020/09/22 11:53:10 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_nvme.c,v 1.25 2022/07/30 12:48:17 mlelstv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -168,14 +168,14 @@ ld_nvme_biodone(void *xc, struct buf *bp
 		if (status != NVME_CQE_SC_SUCCESS) {
 			bp->b_error = EIO;
 			bp->b_resid = bp->b_bcount;
-			aprint_error_dev(sc->sc_ld.sc_dv, "I/O error\n");
+			device_printf(sc->sc_ld.sc_dv, "I/O error\n");
 		} else {
 			bp->b_resid = 0;
 		}
 		lddone(&sc->sc_ld, bp);
 	} else {
 		if (status != NVME_CQE_SC_SUCCESS) {
-			aprint_error_dev(sc->sc_ld.sc_dv, "I/O error\n");
+			device_printf(sc->sc_ld.sc_dv, "I/O error\n");
 		}
 	}
 }