mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

ALSA: hda - move alloc_cmd_io to hda_controller

Browse source 
Combining the call to alloc_cmd_io with the allocate pages function
removes an extra interface between hda_intel and hda_controller.

Signed-off-by: Dylan Reid <dgreid@chromium.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Dylan Reid 2014-02-28 15:41:26 -08:00 committed by Takashi Iwai
parent 6e85dddc1c
commit f19c3ec21b
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sound/pci/hda/hda_controller.c
View file

@ -1026,7 +1026,7 @@ EXPORT_SYMBOL_GPL(azx_attach_pcm_stream);
/*
* CORB / RIRB interface
*/
int azx_alloc_cmd_io(struct azx *chip)
static int azx_alloc_cmd_io(struct azx *chip)
{
int err;
@ -1549,6 +1549,11 @@ int azx_alloc_stream_pages(struct azx *chip)
dev_err(card->dev, "cannot allocate posbuf\n");
return -ENOMEM;
}
/* allocate CORB/RIRB */
err = azx_alloc_cmd_io(chip);
if (err < 0)
return err;
return 0;
}
EXPORT_SYMBOL_GPL(azx_alloc_stream_pages);

1
sound/pci/hda/hda_controller.h
View file

@ -50,7 +50,6 @@ void azx_free_stream_pages(struct azx *chip);
/*
* CORB / RIRB interface
*/
int azx_alloc_cmd_io(struct azx *chip);
void azx_init_cmd_io(struct azx *chip);
void azx_free_cmd_io(struct azx *chip);
void azx_update_rirb(struct azx *chip);

4
sound/pci/hda/hda_intel.c
View file

@ -1807,10 +1807,6 @@ static int azx_first_init(struct azx *chip)
}
err = azx_alloc_stream_pages(chip);
if (err < 0)
return err;
/* allocate CORB/RIRB */
err = azx_alloc_cmd_io(chip);
if (err < 0)
return err;