提交 f6be4e62 编写于 作者: L Lars-Peter Clausen 提交者: Takashi Iwai

ALSA: msnd: Remove always NULL parameter

snd_msnd_pcm() takes 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. This makes the code a bit cleaner and shorter.
Signed-off-by: NLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 db5abb3c
...@@ -679,8 +679,7 @@ static struct snd_pcm_ops snd_msnd_capture_ops = { ...@@ -679,8 +679,7 @@ static struct snd_pcm_ops snd_msnd_capture_ops = {
}; };
int snd_msnd_pcm(struct snd_card *card, int device, int snd_msnd_pcm(struct snd_card *card, int device)
struct snd_pcm **rpcm)
{ {
struct snd_msnd *chip = card->private_data; struct snd_msnd *chip = card->private_data;
struct snd_pcm *pcm; struct snd_pcm *pcm;
...@@ -696,9 +695,6 @@ int snd_msnd_pcm(struct snd_card *card, int device, ...@@ -696,9 +695,6 @@ int snd_msnd_pcm(struct snd_card *card, int device,
pcm->private_data = chip; pcm->private_data = chip;
strcpy(pcm->name, "Hurricane"); strcpy(pcm->name, "Hurricane");
if (rpcm)
*rpcm = pcm;
return 0; return 0;
} }
EXPORT_SYMBOL(snd_msnd_pcm); EXPORT_SYMBOL(snd_msnd_pcm);
......
...@@ -297,7 +297,7 @@ int snd_msnd_disable_irq(struct snd_msnd *chip); ...@@ -297,7 +297,7 @@ int snd_msnd_disable_irq(struct snd_msnd *chip);
void snd_msnd_dsp_halt(struct snd_msnd *chip, struct file *file); void snd_msnd_dsp_halt(struct snd_msnd *chip, struct file *file);
int snd_msnd_DAPQ(struct snd_msnd *chip, int start); int snd_msnd_DAPQ(struct snd_msnd *chip, int start);
int snd_msnd_DARQ(struct snd_msnd *chip, int start); int snd_msnd_DARQ(struct snd_msnd *chip, int start);
int snd_msnd_pcm(struct snd_card *card, int device, struct snd_pcm **rpcm); int snd_msnd_pcm(struct snd_card *card, int device);
int snd_msndmidi_new(struct snd_card *card, int device); int snd_msndmidi_new(struct snd_card *card, int device);
void snd_msndmidi_input_read(void *mpu); void snd_msndmidi_input_read(void *mpu);
......
...@@ -582,7 +582,7 @@ static int snd_msnd_attach(struct snd_card *card) ...@@ -582,7 +582,7 @@ static int snd_msnd_attach(struct snd_card *card)
if (err < 0) if (err < 0)
goto err_release_region; goto err_release_region;
err = snd_msnd_pcm(card, 0, NULL); err = snd_msnd_pcm(card, 0);
if (err < 0) { if (err < 0) {
printk(KERN_ERR LOGNAME ": error creating new PCM device\n"); printk(KERN_ERR LOGNAME ": error creating new PCM device\n");
goto err_release_region; goto err_release_region;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册