leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: fm801: Remove always NULL parameter

Browse Source 
snd_fm801_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:50 +01:00 committed by Takashi Iwai
parent bb814c396a
commit 483337f903
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/pci/fm801.c
View File

@ -704,13 +704,11 @@ static struct snd_pcm_ops snd_fm801_capture_ops = {
.pointer = snd_fm801_capture_pointer, .pointer = snd_fm801_capture_pointer,
}; };
static int snd_fm801_pcm(struct fm801 *chip, int device, struct snd_pcm **rpcm) static int snd_fm801_pcm(struct fm801 *chip, int device)
{ {
struct snd_pcm *pcm; struct snd_pcm *pcm;
int err; int err;
if (rpcm)
*rpcm = NULL;
if ((err = snd_pcm_new(chip->card, "FM801", device, 1, 1, &pcm)) < 0) if ((err = snd_pcm_new(chip->card, "FM801", device, 1, 1, &pcm)) < 0)
return err; return err;
@ -726,16 +724,10 @@ static int snd_fm801_pcm(struct fm801 *chip, int device, struct snd_pcm **rpcm)
snd_dma_pci_data(chip->pci), snd_dma_pci_data(chip->pci),
chip->multichannel ? 128*1024 : 64*1024, 128*1024); chip->multichannel ? 128*1024 : 64*1024, 128*1024);
err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK, return snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,
snd_pcm_alt_chmaps, snd_pcm_alt_chmaps,
chip->multichannel ? 6 : 2, 0, chip->multichannel ? 6 : 2, 0,
NULL); NULL);
if (err < 0)
return err;
if (rpcm)
*rpcm = pcm;
return 0;
} }
/* /*
@ -1340,7 +1332,7 @@ static int snd_card_fm801_probe(struct pci_dev *pci,
if (chip->tea575x_tuner & TUNER_ONLY) if (chip->tea575x_tuner & TUNER_ONLY)
goto __fm801_tuner_only; goto __fm801_tuner_only;
if ((err = snd_fm801_pcm(chip, 0, NULL)) < 0) { if ((err = snd_fm801_pcm(chip, 0)) < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }