Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f19c3ec2 authored by Dylan Reid's avatar Dylan Reid Committed by Takashi Iwai
Browse files

ALSA: hda - move alloc_cmd_io to hda_controller 



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: default avatarDylan Reid <dgreid@chromium.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6e85dddc

sound/pci/hda/hda_controller.c

+6 −1
Original line number Diff line number Diff line
@@ -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);

sound/pci/hda/hda_controller.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

sound/pci/hda/hda_intel.c

+0 −4
Original line number Diff line number Diff line
@@ -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;