CVS commit: src/sys/dev/ata

[Jonathan A. Kollasch]

Module Name:    src
Committed By:   jakllsch
Date:           Mon Feb 17 18:45:01 UTC 2025

Modified Files:
        src/sys/dev/ata: ata.c wd.c

Log Message:
Fix aprint_error_dev() abuse


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.470 -r1.471 src/sys/dev/ata/wd.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/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.169 src/sys/dev/ata/ata.c:1.170
--- src/sys/dev/ata/ata.c:1.169	Tue May 31 08:43:15 2022
+++ src/sys/dev/ata/ata.c	Mon Feb 17 18:45:01 2025
@@ -1,4 +1,4 @@
-/*	$NetBSD: ata.c,v 1.169 2022/05/31 08:43:15 andvar Exp $	*/
+/*	$NetBSD: ata.c,v 1.170 2025/02/17 18:45:01 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.169 2022/05/31 08:43:15 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.170 2025/02/17 18:45:01 jakllsch Exp $");
 
 #include "opt_ata.h"
 
@@ -974,7 +974,7 @@ ata_dmaerr(struct ata_drive_datas *drvp,
 		static const struct timeval serrintvl = { 300, 0 };
 
 		if (ratecheck(&last, &serrintvl)) {
-			aprint_error_dev(drvp->drv_softc,
+			device_printf(drvp->drv_softc,
 			    "excessive DMA errors - %d in last %d transfers\n",
 			    drvp->n_dmaerrs, drvp->n_xfers);
 		}
@@ -1802,7 +1802,7 @@ ata_downgrade_mode(struct ata_drive_data
 	 */
 	if ((drvp->drive_flags & ATA_DRIVE_UDMA) && drvp->UDMA_mode >= 2) {
 		drvp->UDMA_mode--;
-		aprint_error_dev(drv_dev,
+		device_printf(drv_dev,
 		    "transfer error, downgrading to Ultra-DMA mode %d\n",
 		    drvp->UDMA_mode);
 	}
@@ -1814,7 +1814,7 @@ ata_downgrade_mode(struct ata_drive_data
 	else if (drvp->drive_flags & (ATA_DRIVE_DMA | ATA_DRIVE_UDMA)) {
 		drvp->drive_flags &= ~(ATA_DRIVE_DMA | ATA_DRIVE_UDMA);
 		drvp->PIO_mode = drvp->PIO_cap;
-		aprint_error_dev(drv_dev,
+		device_printf(drv_dev,
 		    "transfer error, downgrading to PIO mode %d\n",
 		    drvp->PIO_mode);
 	} else /* already using PIO, can't downgrade */

Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.470 src/sys/dev/ata/wd.c:1.471
--- src/sys/dev/ata/wd.c:1.470	Sun Sep 22 17:31:43 2024
+++ src/sys/dev/ata/wd.c	Mon Feb 17 18:45:01 2025
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.470 2024/09/22 17:31:43 uwe Exp $ */
+/*	$NetBSD: wd.c,v 1.471 2025/02/17 18:45:01 jakllsch Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.470 2024/09/22 17:31:43 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.471 2025/02/17 18:45:01 jakllsch Exp $");
 
 #include "opt_ata.h"
 #include "opt_wd.h"
@@ -993,7 +993,7 @@ retry2:
 
 			dbs = kmem_zalloc(sizeof *dbs, KM_NOSLEEP);
 			if (dbs == NULL) {
-				aprint_error_dev(dksc->sc_dev,
+				device_printf(dksc->sc_dev,
 				    "failed to add bad block to list\n");
 				goto out;
 			}
@@ -1841,7 +1841,7 @@ wd_check_error(const struct dk_softc *dk
 	if (flags & (AT_ERROR | AT_TIMEOU | AT_DF)) {
 		char sbuf[sizeof(at_errbits) + 64];
 		snprintb(sbuf, sizeof(sbuf), at_errbits, flags);
-		aprint_error_dev(dksc->sc_dev, "%s: status=%s\n", func, sbuf);
+		device_printf(dksc->sc_dev, "%s: status=%s\n", func, sbuf);
 		return EIO;
 	}
 	return 0;