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

use aprint_*_dev and device_xname

Browse Source
This commit is contained in:
cegger 2008-04-05 22:04:36 +00:00
parent 335ec2beb5
commit 8bac8763ae
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/ata/ata_raid.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ata_raid.c,v 1.26 2008/03/26 18:09:17 matt Exp $ */
/* $NetBSD: ata_raid.c,v 1.27 2008/04/05 22:04:36 cegger Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.26 2008/03/26 18:09:17 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.27 2008/04/05 22:04:36 cegger Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@ -198,8 +198,8 @@ ataraid_attach(device_t parent, device_t self,
* We're a pseudo-device, so we get to announce our own
* presence.
*/
aprint_normal("%s: found %u RAID volume%s\n",
self->dv_xname, ataraid_array_info_count,
aprint_normal_dev(self, "found %u RAID volume%s\n",
ataraid_array_info_count,
ataraid_array_info_count == 1 ? "" : "s");
TAILQ_FOREACH(aai, &ataraid_array_info_list, aai_list) {

13
sys/dev/ata/ld_ataraid.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ld_ataraid.c,v 1.25 2008/03/21 21:54:59 ad Exp $ */
/* $NetBSD: ld_ataraid.c,v 1.26 2008/04/05 22:04:36 cegger Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.25 2008/03/21 21:54:59 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.26 2008/04/05 22:04:36 cegger Exp $");
#include "rnd.h"
@ -182,8 +182,7 @@ ld_ataraid_attach(struct device *parent, struct device *self,
ata_raid_type_name(aai->aai_type), level);
if (ld->sc_start == NULL) {
aprint_error("%s: unsupported array type\n",
ld->sc_dv.dv_xname);
aprint_error_dev(&ld->sc_dv, "unsupported array type\n");
return;
}
@ -202,7 +201,7 @@ ld_ataraid_attach(struct device *parent, struct device *self,
int bmajor, error;
dev_t dev;
bmajor = devsw_name2blk(adi->adi_dev->dv_xname, NULL, 0);
bmajor = devsw_name2blk(device_xname(adi->adi_dev), NULL, 0);
dev = MAKEDISKDEV(bmajor, device_unit(adi->adi_dev), RAW_PART);
error = bdevvp(dev, &vp);
if (error)
@ -475,8 +474,8 @@ ld_ataraid_iodone_raid0(struct buf *vbp)
adi->adi_status &= ~ADI_S_ONLINE;
printf("%s: error %d on component %d (%s)\n",
sc->sc_ld.sc_dv.dv_xname, bp->b_error, cbp->cb_comp,
adi->adi_dev->dv_xname);
device_xname(&sc->sc_ld.sc_dv), bp->b_error, cbp->cb_comp,
device_xname(adi->adi_dev));
/*
* If we didn't see an error yet and we are reading