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

Use aprint_error_dev. Eliminates XNAME macro.

This commit is contained in:
cegger 2009-01-18 10:40:40 +00:00
parent b118202501
commit 94a79c95d5
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/dev/pci/azalia_codec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: azalia_codec.c,v 1.72 2008/11/12 13:33:10 jmcneill Exp $ */
/* $NetBSD: azalia_codec.c,v 1.73 2009/01/18 10:40:40 cegger Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: azalia_codec.c,v 1.72 2008/11/12 13:33:10 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: azalia_codec.c,v 1.73 2009/01/18 10:40:40 cegger Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: azalia_codec.c,v 1.72 2008/11/12 13:33:10 jmcneill E
#include <sys/systm.h>
#include <dev/pci/azalia.h>
#define XNAME(co) device_xname((co)->dev)
#ifdef MAX_VOLUME_255
# define MIXER_DELTA(n) (AUDIO_MAX_GAIN / (n))
#else
@ -347,7 +346,7 @@ azalia_codec_init_vtbl(codec_t *this)
this->extra = malloc(sizeof(uint32_t) * extra_size,
M_DEVBUF, M_ZERO | M_NOWAIT);
if (this->extra == NULL) {
aprint_error("%s: Not enough memory\n", XNAME(this));
aprint_error_dev(this->dev, "Not enough memory\n");
return ENOMEM;
}
}
@ -548,7 +547,7 @@ generic_mixer_init(codec_t *this)
this->mixers = malloc(sizeof(mixer_item_t) * this->maxmixers,
M_DEVBUF, M_ZERO | M_NOWAIT);
if (this->mixers == NULL) {
aprint_error("%s: out of memory in %s\n", XNAME(this), __func__);
aprint_error_dev(this->dev, "out of memory in %s\n", __func__);
return ENOMEM;
}
@ -1069,7 +1068,7 @@ generic_mixer_ensure_capacity(codec_t *this, size_t newsize)
newbuf = realloc(this->mixers, sizeof(mixer_item_t) * newmax, M_DEVBUF,
M_ZERO | M_NOWAIT);
if (newbuf == NULL) {
aprint_error("%s: out of memory in %s\n", XNAME(this), __func__);
aprint_error_dev(this->dev, "out of memory in %s\n", __func__);
return ENOMEM;
}
this->mixers = newbuf;
@ -1592,8 +1591,8 @@ generic_mixer_get(const codec_t *this, nid_t nid, int target, mixer_ctrl_t *mc)
}
else {
aprint_error("%s: internal error in %s: target=%x\n",
XNAME(this), __func__, target);
aprint_error_dev(this->dev, "internal error in %s: target=%x\n",
__func__, target);
return -1;
}
return 0;
@ -1919,8 +1918,8 @@ generic_mixer_set(codec_t *this, nid_t nid, int target, const mixer_ctrl_t *mc)
}
else {
aprint_error("%s: internal error in %s: target=%x\n",
XNAME(this), __func__, target);
aprint_error_dev(this->dev, "internal error in %s: target=%x\n",
__func__, target);
return -1;
}
return 0;
@ -2208,7 +2207,7 @@ alc260_mixer_init(codec_t *this)
this->mixers = malloc(sizeof(mixer_item_t) * this->nmixers,
M_DEVBUF, M_NOWAIT);
if (this->mixers == NULL) {
aprint_error("%s: out of memory in %s\n", XNAME(this), __func__);
aprint_error_dev(this->dev, "out of memory in %s\n", __func__);
return ENOMEM;
}
memcpy(this->mixers, mi, sizeof(mixer_item_t) * this->nmixers);
@ -2579,7 +2578,7 @@ alc880_mixer_init(codec_t *this)
this->nmixers = __arraycount(alc880_mixer_items);
this->mixers = malloc(sizeof(alc880_mixer_items), M_DEVBUF, M_NOWAIT);
if (this->mixers == NULL) {
aprint_error("%s: out of memory in %s\n", XNAME(this), __func__);
aprint_error_dev(this->dev, "out of memory in %s\n", __func__);
return ENOMEM;
}
memcpy(this->mixers, alc880_mixer_items, sizeof(alc880_mixer_items));
@ -2744,7 +2743,7 @@ alc882_mixer_init(codec_t *this)
this->nmixers = __arraycount(alc882_mixer_items);
this->mixers = malloc(sizeof(alc882_mixer_items), M_DEVBUF, M_NOWAIT);
if (this->mixers == NULL) {
aprint_error("%s: out of memory in %s\n", XNAME(this), __func__);
aprint_error_dev(this->dev, "out of memory in %s\n", __func__);
return ENOMEM;
}
memcpy(this->mixers, alc882_mixer_items, sizeof(alc882_mixer_items));
@ -3012,7 +3011,7 @@ alc883_mixer_init(codec_t *this)
this->nmixers = __arraycount(alc883_mixer_items);
this->mixers = malloc(sizeof(alc883_mixer_items), M_DEVBUF, M_NOWAIT);
if (this->mixers == NULL) {
printf("%s: out of memory in %s\n", XNAME(this), __func__);
aprint_error_dev(this->dev, "out of memory in %s\n", __func__);
return ENOMEM;
}
memcpy(this->mixers, alc883_mixer_items, sizeof(alc883_mixer_items));
@ -3336,7 +3335,7 @@ ad1981hd_mixer_init(codec_t *this)
this->nmixers = __arraycount(ad1981hd_mixer_items);
this->mixers = malloc(sizeof(ad1981hd_mixer_items), M_DEVBUF, M_NOWAIT);
if (this->mixers == NULL) {
aprint_error("%s: out of memory in %s\n", XNAME(this), __func__);
aprint_error_dev(this->dev, "out of memory in %s\n", __func__);
return ENOMEM;
}
memcpy(this->mixers, ad1981hd_mixer_items, sizeof(ad1981hd_mixer_items));
@ -3449,7 +3448,7 @@ ad1983_mixer_init(codec_t *this)
this->nmixers = __arraycount(ad1983_mixer_items);
this->mixers = malloc(sizeof(ad1983_mixer_items), M_DEVBUF, M_NOWAIT);
if (this->mixers == NULL) {
aprint_error("%s: out of memory in %s\n", XNAME(this), __func__);
aprint_error_dev(this->dev, "out of memory in %s\n", __func__);
return ENOMEM;
}
memcpy(this->mixers, ad1983_mixer_items, sizeof(ad1983_mixer_items));
@ -3863,7 +3862,7 @@ ad1986a_mixer_init(codec_t *this)
this->nmixers = __arraycount(ad1986a_mixer_items);
this->mixers = malloc(sizeof(ad1986a_mixer_items), M_DEVBUF, M_NOWAIT);
if (this->mixers == NULL) {
aprint_error("%s: out of memory in %s\n", XNAME(this), __func__);
aprint_error_dev(this->dev, "out of memory in %s\n", __func__);
return ENOMEM;
}
memcpy(this->mixers, ad1986a_mixer_items, sizeof(ad1986a_mixer_items));
@ -3981,7 +3980,7 @@ cmi9880_mixer_init(codec_t *this)
this->nmixers = __arraycount(cmi9880_mixer_items);
this->mixers = malloc(sizeof(cmi9880_mixer_items), M_DEVBUF, M_NOWAIT);
if (this->mixers == NULL) {
aprint_error("%s: out of memory in %s\n", XNAME(this), __func__);
aprint_error_dev(this->dev, "out of memory in %s\n", __func__);
return ENOMEM;
}
memcpy(this->mixers, cmi9880_mixer_items, sizeof(cmi9880_mixer_items));
@ -4141,7 +4140,7 @@ stac9200_mixer_init(codec_t *this)
this->nmixers = __arraycount(stac9200_mixer_items);
this->mixers = malloc(sizeof(stac9200_mixer_items), M_DEVBUF, M_NOWAIT);
if (this->mixers == NULL) {
aprint_error("%s: out of memory in %s\n", XNAME(this), __func__);
aprint_error_dev(this->dev, "out of memory in %s\n", __func__);
return ENOMEM;
}
memcpy(this->mixers, stac9200_mixer_items, sizeof(stac9200_mixer_items));