openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 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:40 +01:00 committed by Takashi Iwai
parent db5abb3c49
commit f6be4e624a
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/isa/msnd/msnd.c
View File

@ -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,
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);

2
sound/isa/msnd/msnd.h
View File

@ -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);

2
sound/isa/msnd/msnd_pinnacle.c
View File

@ -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;