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

Commit 1b16416f authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Takashi Iwai
Browse files

ALSA: trident: Remove always NULL parameters 



The various PCM allocation functions in this driver take a pointer to a
pointer of a PCM where if this parameter is provided the newly allocated PCM
is stored. All callers pass NULL though, so remove the parameter.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0f33991d

sound/pci/trident/trident.c

+3 −3
Original line number Diff line number Diff line
@@ -127,21 +127,21 @@ static int snd_trident_probe(struct pci_dev *pci, 
	sprintf(card->longname, "%s PCI Audio at 0x%lx, irq %d",

		card->shortname, trident->port, trident->irq);



	if ((err = snd_trident_pcm(trident, pcm_dev++, NULL)) < 0) {

	if ((err = snd_trident_pcm(trident, pcm_dev++)) < 0) {

		snd_card_free(card);

		return err;

	}

	switch (trident->device) {

	case TRIDENT_DEVICE_ID_DX:

	case TRIDENT_DEVICE_ID_NX:

		if ((err = snd_trident_foldback_pcm(trident, pcm_dev++, NULL)) < 0) {

		if ((err = snd_trident_foldback_pcm(trident, pcm_dev++)) < 0) {

			snd_card_free(card);

			return err;

		}

		break;

	}

	if (trident->device == TRIDENT_DEVICE_ID_NX || trident->device == TRIDENT_DEVICE_ID_SI7018) {

		if ((err = snd_trident_spdif_pcm(trident, pcm_dev++, NULL)) < 0) {

		if ((err = snd_trident_spdif_pcm(trident, pcm_dev++)) < 0) {

			snd_card_free(card);

			return err;

		}

sound/pci/trident/trident.h

+3 −3
Original line number Diff line number Diff line
@@ -420,9 +420,9 @@ int snd_trident_create(struct snd_card *card, 
		       struct snd_trident ** rtrident);

int snd_trident_create_gameport(struct snd_trident *trident);



int snd_trident_pcm(struct snd_trident * trident, int device, struct snd_pcm **rpcm);

int snd_trident_foldback_pcm(struct snd_trident * trident, int device, struct snd_pcm **rpcm);

int snd_trident_spdif_pcm(struct snd_trident * trident, int device, struct snd_pcm **rpcm);

int snd_trident_pcm(struct snd_trident *trident, int device);

int snd_trident_foldback_pcm(struct snd_trident *trident, int device);

int snd_trident_spdif_pcm(struct snd_trident *trident, int device);

int snd_trident_attach_synthesizer(struct snd_trident * trident);

struct snd_trident_voice *snd_trident_alloc_voice(struct snd_trident * trident, int type,

					     int client, int port);

sound/pci/trident/trident_main.c

+3 −18
Original line number Diff line number Diff line
@@ -2172,14 +2172,11 @@ static struct snd_pcm_ops snd_trident_spdif_7018_ops = { 
  

  ---------------------------------------------------------------------------*/



int snd_trident_pcm(struct snd_trident *trident,

		    int device, struct snd_pcm **rpcm)

int snd_trident_pcm(struct snd_trident *trident, int device)

{

	struct snd_pcm *pcm;

	int err;



	if (rpcm)

		*rpcm = NULL;

	if ((err = snd_pcm_new(trident->card, "trident_dx_nx", device, trident->ChanPCM, 1, &pcm)) < 0)

		return err;
@@ -2214,8 +2211,6 @@ int snd_trident_pcm(struct snd_trident *trident, 
						      snd_dma_pci_data(trident->pci), 64*1024, 128*1024);

	}



	if (rpcm)

		*rpcm = pcm;

	return 0;

}
@@ -2230,16 +2225,13 @@ int snd_trident_pcm(struct snd_trident *trident, 
  

  ---------------------------------------------------------------------------*/



int snd_trident_foldback_pcm(struct snd_trident *trident,

			     int device, struct snd_pcm **rpcm)

int snd_trident_foldback_pcm(struct snd_trident *trident, int device)

{

	struct snd_pcm *foldback;

	int err;

	int num_chan = 3;

	struct snd_pcm_substream *substream;



	if (rpcm)

		*rpcm = NULL;

	if (trident->device == TRIDENT_DEVICE_ID_NX)

		num_chan = 4;

	if ((err = snd_pcm_new(trident->card, "trident_dx_nx", device, 0, num_chan, &foldback)) < 0)
@@ -2271,8 +2263,6 @@ int snd_trident_foldback_pcm(struct snd_trident *trident, 
		snd_pcm_lib_preallocate_pages_for_all(foldback, SNDRV_DMA_TYPE_DEV,

						      snd_dma_pci_data(trident->pci), 64*1024, 128*1024);



	if (rpcm)

		*rpcm = foldback;

	return 0;

}
@@ -2287,14 +2277,11 @@ int snd_trident_foldback_pcm(struct snd_trident *trident, 
  

  ---------------------------------------------------------------------------*/



int snd_trident_spdif_pcm(struct snd_trident *trident,

			  int device, struct snd_pcm **rpcm)

int snd_trident_spdif_pcm(struct snd_trident *trident, int device)

{

	struct snd_pcm *spdif;

	int err;



	if (rpcm)

		*rpcm = NULL;

	if ((err = snd_pcm_new(trident->card, "trident_dx_nx IEC958", device, 1, 0, &spdif)) < 0)

		return err;
@@ -2310,8 +2297,6 @@ int snd_trident_spdif_pcm(struct snd_trident *trident, 


	snd_pcm_lib_preallocate_pages_for_all(spdif, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(trident->pci), 64*1024, 128*1024);



	if (rpcm)

		*rpcm = spdif;

	return 0;

}