Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace aprint_error with aprint_error_dev in config_interrupts callback.

This commit is contained in:
jmcneill 2021-05-14 09:25:14 +00:00
parent fe63e5c41b
commit af67ce95ae
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/spi/m25p.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: m25p.c,v 1.17 2021/01/27 02:32:31 thorpej Exp $ */
/* $NetBSD: m25p.c,v 1.18 2021/05/14 09:25:14 jmcneill Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.17 2021/01/27 02:32:31 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.18 2021/05/14 09:25:14 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -166,7 +166,7 @@ m25p_doattach(device_t self)
/* first we try JEDEC ID read */
cmd = SPIFLASH_CMD_RDJI;
if (spi_send_recv(sc->sc_sh, 1, &cmd, 3, buf)) {
aprint_error(": failed to get JEDEC identification\n");
aprint_error_dev(self, "failed to get JEDEC identification\n");
return;
}
mfgid = buf[0];
@ -175,7 +175,8 @@ m25p_doattach(device_t self)
if ((mfgid == 0xff) || (mfgid == 0)) {
cmd = SPIFLASH_CMD_RDID;
if (spi_send_recv(sc->sc_sh, 1, &cmd, 4, buf)) {
aprint_error(": failed to get legacy signature\n");
aprint_error_dev(self,
"failed to get legacy signature\n");
return;
}
sig = buf[3];
@ -192,8 +193,9 @@ m25p_doattach(device_t self)
}
if (info->name == NULL) {
aprint_error(": vendor 0x%02X dev 0x%04X sig 0x%02X not supported\n",
mfgid, devid, sig);
aprint_error_dev(self,
"vendor 0x%02X dev 0x%04X sig 0x%02X not supported\n",
mfgid, devid, sig);
return;
}