p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Lars-Peter Clausen 2015-01-02 12:24:36 +01:00 committed by Takashi Iwai
parent e9dd86267f
commit 7f60541883
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/sound/ad1816a.h
View File

@ -170,10 +170,9 @@ extern int snd_ad1816a_create(struct snd_card *card, unsigned long port,
int irq, int dma1, int dma2, int irq, int dma1, int dma2,
struct snd_ad1816a *chip); 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_mixer(struct snd_ad1816a *chip);
extern int snd_ad1816a_timer(struct snd_ad1816a *chip, int device, extern int snd_ad1816a_timer(struct snd_ad1816a *chip, int device);
struct snd_timer **rtimer);
#ifdef CONFIG_PM #ifdef CONFIG_PM
extern void snd_ad1816a_suspend(struct snd_ad1816a *chip); extern void snd_ad1816a_suspend(struct snd_ad1816a *chip);
extern void snd_ad1816a_resume(struct snd_ad1816a *chip); extern void snd_ad1816a_resume(struct snd_ad1816a *chip);

5
sound/isa/ad1816a/ad1816a.c
View File

@ -142,7 +142,6 @@ static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,
struct snd_card *card; struct snd_card *card;
struct snd_ad1816a *chip; struct snd_ad1816a *chip;
struct snd_opl3 *opl3; struct snd_opl3 *opl3;
struct snd_timer *timer;
error = snd_card_new(&pcard->card->dev, error = snd_card_new(&pcard->card->dev,
index[dev], id[dev], THIS_MODULE, 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", sprintf(card->longname, "%s, SS at 0x%lx, irq %d, dma %d&%d",
card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]); 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); snd_card_free(card);
return error; return error;
} }
@ -182,7 +181,7 @@ static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,
return error; return error;
} }
error = snd_ad1816a_timer(chip, 0, &timer); error = snd_ad1816a_timer(chip, 0);
if (error < 0) { if (error < 0) {
snd_card_free(card); snd_card_free(card);
return error; return error;

9
sound/isa/ad1816a/ad1816a_lib.c
View File

@ -675,7 +675,7 @@ static struct snd_pcm_ops snd_ad1816a_capture_ops = {
.pointer = snd_ad1816a_capture_pointer, .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; int error;
struct snd_pcm *pcm; 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); 64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
chip->pcm = pcm; chip->pcm = pcm;
if (rpcm)
*rpcm = pcm;
return 0; return 0;
} }
int snd_ad1816a_timer(struct snd_ad1816a *chip, int device, int snd_ad1816a_timer(struct snd_ad1816a *chip, int device)
struct snd_timer **rtimer)
{ {
struct snd_timer *timer; struct snd_timer *timer;
struct snd_timer_id tid; struct snd_timer_id tid;
@ -720,8 +717,6 @@ int snd_ad1816a_timer(struct snd_ad1816a *chip, int device,
timer->private_data = chip; timer->private_data = chip;
chip->timer = timer; chip->timer = timer;
timer->hw = snd_ad1816a_timer_table; timer->hw = snd_ad1816a_timer_table;
if (rtimer)
*rtimer = timer;
return 0; return 0;
} }