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

Commit 7f605418 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Takashi Iwai
Browse files

ALSA: ad1816a: Remove always NULL parameters 



snd_ad1816a_pcm() and snd_ad1816a_timer() take a pointer to a pointer of a
PCM/timer where if this parameter is provided the newly allocated object is
stored. All callers pass NULL though, so remove the parameter. This makes
the code a bit cleaner and shorter.

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

include/sound/ad1816a.h

+2 −3
Original line number Diff line number Diff line
@@ -170,10 +170,9 @@ extern int snd_ad1816a_create(struct snd_card *card, unsigned long port, 
			      int irq, int dma1, int dma2,

			      struct snd_ad1816a *chip);



extern int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm);

extern int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device);

extern int snd_ad1816a_mixer(struct snd_ad1816a *chip);

extern int snd_ad1816a_timer(struct snd_ad1816a *chip, int device,

			     struct snd_timer **rtimer);

extern int snd_ad1816a_timer(struct snd_ad1816a *chip, int device);

#ifdef CONFIG_PM

extern void snd_ad1816a_suspend(struct snd_ad1816a *chip);

extern void snd_ad1816a_resume(struct snd_ad1816a *chip);

sound/isa/ad1816a/ad1816a.c

+2 −3
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard, 
	struct snd_card *card;

	struct snd_ad1816a *chip;

	struct snd_opl3 *opl3;

	struct snd_timer *timer;



	error = snd_card_new(&pcard->card->dev,

			     index[dev], id[dev], THIS_MODULE,
@@ -172,7 +171,7 @@ static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard, 
	sprintf(card->longname, "%s, SS at 0x%lx, irq %d, dma %d&%d",

		card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);



	if ((error = snd_ad1816a_pcm(chip, 0, NULL)) < 0) {

	if ((error = snd_ad1816a_pcm(chip, 0)) < 0) {

		snd_card_free(card);

		return error;

	}
@@ -182,7 +181,7 @@ static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard, 
		return error;

	}



	error = snd_ad1816a_timer(chip, 0, &timer);

	error = snd_ad1816a_timer(chip, 0);

	if (error < 0) {

		snd_card_free(card);

		return error;

sound/isa/ad1816a/ad1816a_lib.c

+2 −7
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ static struct snd_pcm_ops snd_ad1816a_capture_ops = { 
	.pointer =	snd_ad1816a_capture_pointer,

};



int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm)

int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device)

{

	int error;

	struct snd_pcm *pcm;
@@ -697,13 +697,10 @@ int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm) 
					      64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);



	chip->pcm = pcm;

	if (rpcm)

		*rpcm = pcm;

	return 0;

}



int snd_ad1816a_timer(struct snd_ad1816a *chip, int device,

		      struct snd_timer **rtimer)

int snd_ad1816a_timer(struct snd_ad1816a *chip, int device)

{

	struct snd_timer *timer;

	struct snd_timer_id tid;
@@ -720,8 +717,6 @@ int snd_ad1816a_timer(struct snd_ad1816a *chip, int device, 
	timer->private_data = chip;

	chip->timer = timer;

	timer->hw = snd_ad1816a_timer_table;

	if (rtimer)

		*rtimer = timer;

	return 0;

}