azalia: Make `find_verb` function non-static
To allow dropping copies of this function, make it non-static. Also, rename it to `azalia_find_verb` as the function is now globally visible. Finally, replace the copies in chipset code with `azalia_find_verb`. Change-Id: Ie66323b2c62139e86d3d7e003f6653a3def7b5f2 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48348 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org>
This commit is contained in:
parent
e108e41b33
commit
75c4f06314
|
@ -85,7 +85,7 @@ no_codec:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
|
u32 azalia_find_verb(struct device *dev, u32 viddid, const u32 **verb)
|
||||||
{
|
{
|
||||||
int idx = 0;
|
int idx = 0;
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
|
||||||
/* 2 */
|
/* 2 */
|
||||||
reg32 = read32(base + HDA_IR_REG);
|
reg32 = read32(base + HDA_IR_REG);
|
||||||
printk(BIOS_DEBUG, "azalia_audio: codec viddid: %08x\n", reg32);
|
printk(BIOS_DEBUG, "azalia_audio: codec viddid: %08x\n", reg32);
|
||||||
verb_size = find_verb(dev, reg32, &verb);
|
verb_size = azalia_find_verb(dev, reg32, &verb);
|
||||||
|
|
||||||
if (!verb_size) {
|
if (!verb_size) {
|
||||||
printk(BIOS_DEBUG, "azalia_audio: No verb!\n");
|
printk(BIOS_DEBUG, "azalia_audio: No verb!\n");
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#define HDA_ICII_VALID (1 << 1)
|
#define HDA_ICII_VALID (1 << 1)
|
||||||
|
|
||||||
int azalia_set_bits(void *port, u32 mask, u32 val);
|
int azalia_set_bits(void *port, u32 mask, u32 val);
|
||||||
|
u32 azalia_find_verb(struct device *dev, u32 viddid, const u32 **verb);
|
||||||
void azalia_audio_init(struct device *dev);
|
void azalia_audio_init(struct device *dev);
|
||||||
extern struct device_operations default_azalia_audio_ops;
|
extern struct device_operations default_azalia_audio_ops;
|
||||||
|
|
||||||
|
|
|
@ -41,24 +41,6 @@ no_codec:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
|
|
||||||
{
|
|
||||||
int idx = 0;
|
|
||||||
|
|
||||||
while (idx < (cim_verb_data_size / sizeof(u32))) {
|
|
||||||
u32 verb_size = 4 * cim_verb_data[idx + 2]; // in u32
|
|
||||||
if (cim_verb_data[idx] != viddid) {
|
|
||||||
idx += verb_size + 3; // skip verb + header
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
*verb = &cim_verb_data[idx + 3];
|
|
||||||
return verb_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Not all codecs need to load another verb */
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Wait 50usec for the codec to indicate it is ready.
|
* Wait 50usec for the codec to indicate it is ready.
|
||||||
* No response would imply that the codec is non-operative.
|
* No response would imply that the codec is non-operative.
|
||||||
|
@ -131,7 +113,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
|
||||||
/* 2 */
|
/* 2 */
|
||||||
reg32 = read32(base + HDA_IR_REG);
|
reg32 = read32(base + HDA_IR_REG);
|
||||||
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
|
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
|
||||||
verb_size = find_verb(dev, reg32, &verb);
|
verb_size = azalia_find_verb(dev, reg32, &verb);
|
||||||
|
|
||||||
if (!verb_size) {
|
if (!verb_size) {
|
||||||
printk(BIOS_DEBUG, "Azalia: No verb!\n");
|
printk(BIOS_DEBUG, "Azalia: No verb!\n");
|
||||||
|
|
|
@ -39,24 +39,6 @@ no_codec:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
|
|
||||||
{
|
|
||||||
int idx = 0;
|
|
||||||
|
|
||||||
while (idx < (cim_verb_data_size / sizeof(u32))) {
|
|
||||||
u32 verb_size = 4 * cim_verb_data[idx + 2]; // in u32
|
|
||||||
if (cim_verb_data[idx] != viddid) {
|
|
||||||
idx += verb_size + 3; // skip verb + header
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
*verb = &cim_verb_data[idx + 3];
|
|
||||||
return verb_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Not all codecs need to load another verb */
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Wait 50usec for the codec to indicate it is ready.
|
* Wait 50usec for the codec to indicate it is ready.
|
||||||
* No response would imply that the codec is non-operative.
|
* No response would imply that the codec is non-operative.
|
||||||
|
@ -129,7 +111,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
|
||||||
/* 2 */
|
/* 2 */
|
||||||
reg32 = read32(base + HDA_IR_REG);
|
reg32 = read32(base + HDA_IR_REG);
|
||||||
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
|
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
|
||||||
verb_size = find_verb(dev, reg32, &verb);
|
verb_size = azalia_find_verb(dev, reg32, &verb);
|
||||||
|
|
||||||
if (!verb_size) {
|
if (!verb_size) {
|
||||||
printk(BIOS_DEBUG, "Azalia: No verb!\n");
|
printk(BIOS_DEBUG, "Azalia: No verb!\n");
|
||||||
|
|
|
@ -39,24 +39,6 @@ no_codec:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
|
|
||||||
{
|
|
||||||
int idx = 0;
|
|
||||||
|
|
||||||
while (idx < (cim_verb_data_size / sizeof(u32))) {
|
|
||||||
u32 verb_size = 4 * cim_verb_data[idx + 2]; // in u32
|
|
||||||
if (cim_verb_data[idx] != viddid) {
|
|
||||||
idx += verb_size + 3; // skip verb + header
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
*verb = &cim_verb_data[idx + 3];
|
|
||||||
return verb_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Not all codecs need to load another verb */
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Wait 50usec for the codec to indicate it is ready.
|
* Wait 50usec for the codec to indicate it is ready.
|
||||||
* No response would imply that the codec is non-operative.
|
* No response would imply that the codec is non-operative.
|
||||||
|
@ -129,7 +111,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
|
||||||
/* 2 */
|
/* 2 */
|
||||||
reg32 = read32(base + HDA_IR_REG);
|
reg32 = read32(base + HDA_IR_REG);
|
||||||
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
|
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
|
||||||
verb_size = find_verb(dev, reg32, &verb);
|
verb_size = azalia_find_verb(dev, reg32, &verb);
|
||||||
|
|
||||||
if (!verb_size) {
|
if (!verb_size) {
|
||||||
printk(BIOS_DEBUG, "Azalia: No verb!\n");
|
printk(BIOS_DEBUG, "Azalia: No verb!\n");
|
||||||
|
|
|
@ -39,24 +39,6 @@ no_codec:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
|
|
||||||
{
|
|
||||||
int idx = 0;
|
|
||||||
|
|
||||||
while (idx < (cim_verb_data_size / sizeof(u32))) {
|
|
||||||
u32 verb_size = 4 * cim_verb_data[idx + 2]; // in u32
|
|
||||||
if (cim_verb_data[idx] != viddid) {
|
|
||||||
idx += verb_size + 3; // skip verb + header
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
*verb = &cim_verb_data[idx + 3];
|
|
||||||
return verb_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Not all codecs need to load another verb */
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Wait 50usec for the codec to indicate it is ready.
|
* Wait 50usec for the codec to indicate it is ready.
|
||||||
* No response would imply that the codec is non-operative.
|
* No response would imply that the codec is non-operative.
|
||||||
|
@ -129,7 +111,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
|
||||||
/* 2 */
|
/* 2 */
|
||||||
reg32 = read32(base + HDA_IR_REG);
|
reg32 = read32(base + HDA_IR_REG);
|
||||||
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
|
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
|
||||||
verb_size = find_verb(dev, reg32, &verb);
|
verb_size = azalia_find_verb(dev, reg32, &verb);
|
||||||
|
|
||||||
if (!verb_size) {
|
if (!verb_size) {
|
||||||
printk(BIOS_DEBUG, "Azalia: No verb!\n");
|
printk(BIOS_DEBUG, "Azalia: No verb!\n");
|
||||||
|
|
|
@ -37,24 +37,6 @@ no_codec:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
|
|
||||||
{
|
|
||||||
int idx = 0;
|
|
||||||
|
|
||||||
while (idx < (cim_verb_data_size / sizeof(u32))) {
|
|
||||||
u32 verb_size = 4 * cim_verb_data[idx + 2]; // in u32
|
|
||||||
if (cim_verb_data[idx] != viddid) {
|
|
||||||
idx += verb_size + 3; // skip verb + header
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
*verb = &cim_verb_data[idx + 3];
|
|
||||||
return verb_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Not all codecs need to load another verb */
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Wait 50usec for the codec to indicate it is ready.
|
* Wait 50usec for the codec to indicate it is ready.
|
||||||
* No response would imply that the codec is non-operative.
|
* No response would imply that the codec is non-operative.
|
||||||
|
@ -127,7 +109,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
|
||||||
/* 2 */
|
/* 2 */
|
||||||
reg32 = read32(base + HDA_IR_REG);
|
reg32 = read32(base + HDA_IR_REG);
|
||||||
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
|
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
|
||||||
verb_size = find_verb(dev, reg32, &verb);
|
verb_size = azalia_find_verb(dev, reg32, &verb);
|
||||||
|
|
||||||
if (!verb_size) {
|
if (!verb_size) {
|
||||||
printk(BIOS_DEBUG, "Azalia: No verb!\n");
|
printk(BIOS_DEBUG, "Azalia: No verb!\n");
|
||||||
|
|
Loading…
Reference in New Issue