AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ALSA: wss: Remove (almost) always NULL parameters

Browse Source 
Most callers of snd_wss_pcm(), snd_wss_timer() and snd_cs4236_pcm() pass
NULL as the last parameter, some callers pass a pointer but never use it
after the function has been called and only a few callers pass a pointer and
actually use it. The later is only the case for snd_wss_pcm() for
snd_cs4236_pcm() and it is possible to get the same PCM object by accessing
the pcm field of the snd_wss struct that was passed as the first parameter.

This function removes the last parameters from the functions mentioned above
and updates the callers which used it to use chip->pcm instead. This allows
us to slightly simplify the functions since they don't have to check and set
the last parameter anymore which makes the code slightly shorter and
cleaner.

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:43 +01:00 committed by Takashi Iwai
parent 92533f1888
commit fa60c06569
17 changed files with 51 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sound/wss.h
View File

@ -154,8 +154,8 @@ int snd_wss_create(struct snd_card *card,
unsigned short hardware, unsigned short hardware,
unsigned short hwshare, unsigned short hwshare,
struct snd_wss **rchip); struct snd_wss **rchip);
int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm); int snd_wss_pcm(struct snd_wss *chip, int device);
int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer); int snd_wss_timer(struct snd_wss *chip, int device);
int snd_wss_mixer(struct snd_wss *chip); int snd_wss_mixer(struct snd_wss *chip);
const struct snd_pcm_ops *snd_wss_get_pcm_ops(int direction); const struct snd_pcm_ops *snd_wss_get_pcm_ops(int direction);
@ -167,7 +167,7 @@ int snd_cs4236_create(struct snd_card *card,
unsigned short hardware, unsigned short hardware,
unsigned short hwshare, unsigned short hwshare,
struct snd_wss **rchip); struct snd_wss **rchip);
int snd_cs4236_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm); int snd_cs4236_pcm(struct snd_wss *chip, int device);
int snd_cs4236_mixer(struct snd_wss *chip); int snd_cs4236_mixer(struct snd_wss *chip);
/* /*

7
sound/isa/ad1848/ad1848.c
View File

@ -88,7 +88,6 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_wss *chip; struct snd_wss *chip;
struct snd_pcm *pcm;
int error; int error;
error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card); error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card);
@ -103,7 +102,7 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n)
card->private_data = chip; card->private_data = chip;
error = snd_wss_pcm(chip, 0, &pcm); error = snd_wss_pcm(chip, 0);
if (error < 0) if (error < 0)
goto out; goto out;
@ -112,10 +111,10 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n)
goto out; goto out;
strcpy(card->driver, "AD1848"); strcpy(card->driver, "AD1848");
strcpy(card->shortname, pcm->name); strcpy(card->shortname, chip->pcm->name);
sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d", sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
pcm->name, chip->port, irq[n], dma1[n]); chip->pcm->name, chip->port, irq[n], dma1[n]);
if (thinkpad[n]) if (thinkpad[n])
strcat(card->longname, " [Thinkpad]"); strcat(card->longname, " [Thinkpad]");

4
sound/isa/azt2320.c
View File

@ -215,7 +215,7 @@ static int snd_card_azt2320_probe(int dev,
sprintf(card->longname, "%s, WSS at 0x%lx, irq %i, dma %i&%i", sprintf(card->longname, "%s, WSS at 0x%lx, irq %i, dma %i&%i",
card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]); card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);
error = snd_wss_pcm(chip, 0, NULL); error = snd_wss_pcm(chip, 0);
if (error < 0) { if (error < 0) {
snd_card_free(card); snd_card_free(card);
return error; return error;
@ -225,7 +225,7 @@ static int snd_card_azt2320_probe(int dev,
snd_card_free(card); snd_card_free(card);
return error; return error;
} }
error = snd_wss_timer(chip, 0, NULL); error = snd_wss_timer(chip, 0);
if (error < 0) { if (error < 0) {
snd_card_free(card); snd_card_free(card);
return error; return error;

4
sound/isa/cmi8328.c
View File

@ -307,7 +307,7 @@ static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
if (err < 0) if (err < 0)
goto error; goto error;
err = snd_wss_pcm(cmi->wss, 0, NULL); err = snd_wss_pcm(cmi->wss, 0);
if (err < 0) if (err < 0)
goto error; goto error;
@ -318,7 +318,7 @@ static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
if (err < 0) if (err < 0)
goto error; goto error;
if (snd_wss_timer(cmi->wss, 0, NULL) < 0) if (snd_wss_timer(cmi->wss, 0) < 0)
snd_printk(KERN_WARNING "error initializing WSS timer\n"); snd_printk(KERN_WARNING "error initializing WSS timer\n");
if (mpuport[ndev] == SNDRV_AUTO_PORT) { if (mpuport[ndev] == SNDRV_AUTO_PORT) {

9
sound/isa/cs423x/cs4231.c
View File

@ -92,7 +92,6 @@ static int snd_cs4231_probe(struct device *dev, unsigned int n)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_wss *chip; struct snd_wss *chip;
struct snd_pcm *pcm;
int error; int error;
error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card); error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card);
@ -106,15 +105,15 @@ static int snd_cs4231_probe(struct device *dev, unsigned int n)
card->private_data = chip; card->private_data = chip;
error = snd_wss_pcm(chip, 0, &pcm); error = snd_wss_pcm(chip, 0);
if (error < 0) if (error < 0)
goto out; goto out;
strcpy(card->driver, "CS4231"); strcpy(card->driver, "CS4231");
strcpy(card->shortname, pcm->name); strcpy(card->shortname, chip->pcm->name);
sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d", sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
pcm->name, chip->port, irq[n], dma1[n]); chip->pcm->name, chip->port, irq[n], dma1[n]);
if (dma2[n] >= 0) if (dma2[n] >= 0)
sprintf(card->longname + strlen(card->longname), "&%d", dma2[n]); sprintf(card->longname + strlen(card->longname), "&%d", dma2[n]);
@ -122,7 +121,7 @@ static int snd_cs4231_probe(struct device *dev, unsigned int n)
if (error < 0) if (error < 0)
goto out; goto out;
error = snd_wss_timer(chip, 0, NULL); error = snd_wss_timer(chip, 0);
if (error < 0) if (error < 0)
goto out; goto out;

13
sound/isa/cs423x/cs4236.c
View File

@ -382,7 +382,6 @@ static int snd_cs423x_card_new(struct device *pdev, int dev,
static int snd_cs423x_probe(struct snd_card *card, int dev) static int snd_cs423x_probe(struct snd_card *card, int dev)
{ {
struct snd_card_cs4236 *acard; struct snd_card_cs4236 *acard;
struct snd_pcm *pcm;
struct snd_wss *chip; struct snd_wss *chip;
struct snd_opl3 *opl3; struct snd_opl3 *opl3;
int err; int err;
@ -404,7 +403,7 @@ static int snd_cs423x_probe(struct snd_card *card, int dev)
acard->chip = chip; acard->chip = chip;
if (chip->hardware & WSS_HW_CS4236B_MASK) { if (chip->hardware & WSS_HW_CS4236B_MASK) {
err = snd_cs4236_pcm(chip, 0, &pcm); err = snd_cs4236_pcm(chip, 0);
if (err < 0) if (err < 0)
return err; return err;
@ -412,7 +411,7 @@ static int snd_cs423x_probe(struct snd_card *card, int dev)
if (err < 0) if (err < 0)
return err; return err;
} else { } else {
err = snd_wss_pcm(chip, 0, &pcm); err = snd_wss_pcm(chip, 0);
if (err < 0) if (err < 0)
return err; return err;
@ -420,17 +419,17 @@ static int snd_cs423x_probe(struct snd_card *card, int dev)
if (err < 0) if (err < 0)
return err; return err;
} }
strcpy(card->driver, pcm->name); strcpy(card->driver, chip->pcm->name);
strcpy(card->shortname, pcm->name); strcpy(card->shortname, chip->pcm->name);
sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i",
pcm->name, chip->pcm->name,
chip->port, chip->port,
irq[dev], irq[dev],
dma1[dev]); dma1[dev]);
if (dma2[dev] >= 0) if (dma2[dev] >= 0)
sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]); sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
err = snd_wss_timer(chip, 0, NULL); err = snd_wss_timer(chip, 0);
if (err < 0) if (err < 0)
return err; return err;

9
sound/isa/cs423x/cs4236_lib.c
View File

@ -376,17 +376,14 @@ int snd_cs4236_create(struct snd_card *card,
return 0; return 0;
} }
int snd_cs4236_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm) int snd_cs4236_pcm(struct snd_wss *chip, int device)
{ {
struct snd_pcm *pcm;
int err; int err;
err = snd_wss_pcm(chip, device, &pcm); err = snd_wss_pcm(chip, device);
if (err < 0) if (err < 0)
return err; return err;
pcm->info_flags &= ~SNDRV_PCM_INFO_JOINT_DUPLEX; chip->pcm->info_flags &= ~SNDRV_PCM_INFO_JOINT_DUPLEX;
if (rpcm)
*rpcm = pcm;
return 0; return 0;
} }

4
sound/isa/galaxy/galaxy.c
View File

@ -569,7 +569,7 @@ static int snd_galaxy_probe(struct device *dev, unsigned int n)
if (err < 0) if (err < 0)
goto error; goto error;
err = snd_wss_pcm(chip, 0, NULL); err = snd_wss_pcm(chip, 0);
if (err < 0) if (err < 0)
goto error; goto error;
@ -577,7 +577,7 @@ static int snd_galaxy_probe(struct device *dev, unsigned int n)
if (err < 0) if (err < 0)
goto error; goto error;
err = snd_wss_timer(chip, 0, NULL); err = snd_wss_timer(chip, 0);
if (err < 0) if (err < 0)
goto error; goto error;

4
sound/isa/gus/gusmax.c
View File

@ -309,7 +309,7 @@ static int snd_gusmax_probe(struct device *pdev, unsigned int dev)
if (err < 0) if (err < 0)
goto _err; goto _err;
err = snd_wss_pcm(wss, 0, NULL); err = snd_wss_pcm(wss, 0);
if (err < 0) if (err < 0)
goto _err; goto _err;
@ -317,7 +317,7 @@ static int snd_gusmax_probe(struct device *pdev, unsigned int dev)
if (err < 0) if (err < 0)
goto _err; goto _err;
err = snd_wss_timer(wss, 2, NULL); err = snd_wss_timer(wss, 2);
if (err < 0) if (err < 0)
goto _err; goto _err;

10
sound/isa/gus/interwave.c
View File

@ -647,7 +647,6 @@ static int snd_interwave_probe(struct snd_card *card, int dev)
#ifdef SNDRV_STB #ifdef SNDRV_STB
struct snd_i2c_bus *i2c_bus; struct snd_i2c_bus *i2c_bus;
#endif #endif
struct snd_pcm *pcm;
char *str; char *str;
int err; int err;
@ -695,14 +694,15 @@ static int snd_interwave_probe(struct snd_card *card, int dev)
if (err < 0) if (err < 0)
return err; return err;
err = snd_wss_pcm(wss, 0, &pcm); err = snd_wss_pcm(wss, 0);
if (err < 0) if (err < 0)
return err; return err;
sprintf(pcm->name + strlen(pcm->name), " rev %c", gus->revision + 'A'); sprintf(wss->pcm->name + strlen(wss->pcm->name), " rev %c",
strcat(pcm->name, " (codec)"); gus->revision + 'A');
strcat(wss->pcm->name, " (codec)");
err = snd_wss_timer(wss, 2, NULL); err = snd_wss_timer(wss, 2);
if (err < 0) if (err < 0)
return err; return err;

4
sound/isa/opl3sa2.c
View File

@ -684,7 +684,7 @@ static int snd_opl3sa2_probe(struct snd_card *card, int dev)
return err; return err;
} }
chip->wss = wss; chip->wss = wss;
err = snd_wss_pcm(wss, 0, NULL); err = snd_wss_pcm(wss, 0);
if (err < 0) if (err < 0)
return err; return err;
err = snd_wss_mixer(wss); err = snd_wss_mixer(wss);
@ -693,7 +693,7 @@ static int snd_opl3sa2_probe(struct snd_card *card, int dev)
err = snd_opl3sa2_mixer(card); err = snd_opl3sa2_mixer(card);
if (err < 0) if (err < 0)
return err; return err;
err = snd_wss_timer(wss, 0, NULL); err = snd_wss_timer(wss, 0);
if (err < 0) if (err < 0)
return err; return err;
if (fm_port[dev] >= 0x340 && fm_port[dev] < 0x400) { if (fm_port[dev] >= 0x340 && fm_port[dev] < 0x400) {

12
sound/isa/opti9xx/miro.c
View File

@ -1270,8 +1270,6 @@ static int snd_miro_probe(struct snd_card *card)
int error; int error;
struct snd_miro *miro = card->private_data; struct snd_miro *miro = card->private_data;
struct snd_wss *codec; struct snd_wss *codec;
struct snd_timer *timer;
struct snd_pcm *pcm;
struct snd_rawmidi *rmidi; struct snd_rawmidi *rmidi;
if (!miro->res_mc_base) { if (!miro->res_mc_base) {
@ -1310,7 +1308,7 @@ static int snd_miro_probe(struct snd_card *card)
if (error < 0) if (error < 0)
return error; return error;
error = snd_wss_pcm(codec, 0, &pcm); error = snd_wss_pcm(codec, 0);
if (error < 0) if (error < 0)
return error; return error;
@ -1318,11 +1316,11 @@ static int snd_miro_probe(struct snd_card *card)
if (error < 0) if (error < 0)
return error; return error;
error = snd_wss_timer(codec, 0, &timer); error = snd_wss_timer(codec, 0);
if (error < 0) if (error < 0)
return error; return error;
miro->pcm = pcm; miro->pcm = codec->pcm;
error = snd_miro_mixer(card, miro); error = snd_miro_mixer(card, miro);
if (error < 0) if (error < 0)
@ -1356,8 +1354,8 @@ static int snd_miro_probe(struct snd_card *card)
strcpy(card->driver, "miro"); strcpy(card->driver, "miro");
sprintf(card->longname, "%s: OPTi%s, %s at 0x%lx, irq %d, dma %d&%d", sprintf(card->longname, "%s: OPTi%s, %s at 0x%lx, irq %d, dma %d&%d",
card->shortname, miro->name, pcm->name, miro->wss_base + 4, card->shortname, miro->name, codec->pcm->name,
miro->irq, miro->dma1, miro->dma2); miro->wss_base + 4, miro->irq, miro->dma1, miro->dma2);
if (mpu_port <= 0 || mpu_port == SNDRV_AUTO_PORT) if (mpu_port <= 0 || mpu_port == SNDRV_AUTO_PORT)
rmidi = NULL; rmidi = NULL;

13
sound/isa/opti9xx/opti92x-ad1848.c
View File

@ -820,10 +820,6 @@ static int snd_opti9xx_probe(struct snd_card *card)
int xdma2; int xdma2;
struct snd_opti9xx *chip = card->private_data; struct snd_opti9xx *chip = card->private_data;
struct snd_wss *codec; struct snd_wss *codec;
#ifdef CS4231
struct snd_timer *timer;
#endif
struct snd_pcm *pcm;
struct snd_rawmidi *rmidi; struct snd_rawmidi *rmidi;
struct snd_hwdep *synth; struct snd_hwdep *synth;
@ -855,7 +851,7 @@ static int snd_opti9xx_probe(struct snd_card *card)
if (error < 0) if (error < 0)
return error; return error;
chip->codec = codec; chip->codec = codec;
error = snd_wss_pcm(codec, 0, &pcm); error = snd_wss_pcm(codec, 0);
if (error < 0) if (error < 0)
return error; return error;
error = snd_wss_mixer(codec); error = snd_wss_mixer(codec);
@ -867,7 +863,7 @@ static int snd_opti9xx_probe(struct snd_card *card)
return error; return error;
#endif #endif
#ifdef CS4231 #ifdef CS4231
error = snd_wss_timer(codec, 0, &timer); error = snd_wss_timer(codec, 0);
if (error < 0) if (error < 0)
return error; return error;
#endif #endif
@ -884,11 +880,12 @@ static int snd_opti9xx_probe(struct snd_card *card)
sprintf(card->shortname, "OPTi %s", card->driver); sprintf(card->shortname, "OPTi %s", card->driver);
#if defined(CS4231) || defined(OPTi93X) #if defined(CS4231) || defined(OPTi93X)
sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d&%d", sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d&%d",
card->shortname, pcm->name, card->shortname, codec->pcm->name,
chip->wss_base + 4, irq, dma1, xdma2); chip->wss_base + 4, irq, dma1, xdma2);
#else #else
sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d", sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d",
card->shortname, pcm->name, chip->wss_base + 4, irq, dma1); card->shortname, codec->pcm->name, chip->wss_base + 4, irq,
dma1);
#endif /* CS4231 || OPTi93X */ #endif /* CS4231 || OPTi93X */
if (mpu_port <= 0 || mpu_port == SNDRV_AUTO_PORT) if (mpu_port <= 0 || mpu_port == SNDRV_AUTO_PORT)

2
sound/isa/sc6000.c
View File

@ -625,7 +625,7 @@ static int snd_sc6000_probe(struct device *devptr, unsigned int dev)
if (err < 0) if (err < 0)
goto err_unmap2; goto err_unmap2;
err = snd_wss_pcm(chip, 0, NULL); err = snd_wss_pcm(chip, 0);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR PFX snd_printk(KERN_ERR PFX
"error creating new WSS PCM device\n"); "error creating new WSS PCM device\n");

5
sound/isa/sscape.c
View File

@ -877,7 +877,6 @@ static int create_ad1845(struct snd_card *card, unsigned port,
codec_type, WSS_HWSHARE_DMA1, &chip); codec_type, WSS_HWSHARE_DMA1, &chip);
if (!err) { if (!err) {
unsigned long flags; unsigned long flags;
struct snd_pcm *pcm;
if (sscape->type != SSCAPE_VIVO) { if (sscape->type != SSCAPE_VIVO) {
/* /*
@ -893,7 +892,7 @@ static int create_ad1845(struct snd_card *card, unsigned port,
} }
err = snd_wss_pcm(chip, 0, &pcm); err = snd_wss_pcm(chip, 0);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "sscape: No PCM device " snd_printk(KERN_ERR "sscape: No PCM device "
"for AD1845 chip\n"); "for AD1845 chip\n");
@ -907,7 +906,7 @@ static int create_ad1845(struct snd_card *card, unsigned port,
goto _error; goto _error;
} }
if (chip->hardware != WSS_HW_AD1848) { if (chip->hardware != WSS_HW_AD1848) {
err = snd_wss_timer(chip, 0, NULL); err = snd_wss_timer(chip, 0);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "sscape: No timer device " snd_printk(KERN_ERR "sscape: No timer device "
"for AD1845 chip\n"); "for AD1845 chip\n");

4
sound/isa/wavefront/wavefront.c
View File

@ -380,11 +380,11 @@ snd_wavefront_probe (struct snd_card *card, int dev)
return err; return err;
} }
err = snd_wss_pcm(chip, 0, NULL); err = snd_wss_pcm(chip, 0);
if (err < 0) if (err < 0)
return err; return err;
err = snd_wss_timer(chip, 0, NULL); err = snd_wss_timer(chip, 0);
if (err < 0) if (err < 0)
return err; return err;

8
sound/isa/wss/wss_lib.c
View File

@ -1923,7 +1923,7 @@ static struct snd_pcm_ops snd_wss_capture_ops = {
.pointer = snd_wss_capture_pointer, .pointer = snd_wss_capture_pointer,
}; };
int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm) int snd_wss_pcm(struct snd_wss *chip, int device)
{ {
struct snd_pcm *pcm; struct snd_pcm *pcm;
int err; int err;
@ -1949,8 +1949,6 @@ int snd_wss_pcm(struct snd_wss *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;
} }
EXPORT_SYMBOL(snd_wss_pcm); EXPORT_SYMBOL(snd_wss_pcm);
@ -1961,7 +1959,7 @@ static void snd_wss_timer_free(struct snd_timer *timer)
chip->timer = NULL; chip->timer = NULL;
} }
int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer) int snd_wss_timer(struct snd_wss *chip, int device)
{ {
struct snd_timer *timer; struct snd_timer *timer;
struct snd_timer_id tid; struct snd_timer_id tid;
@ -1980,8 +1978,6 @@ int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer)
timer->private_free = snd_wss_timer_free; timer->private_free = snd_wss_timer_free;
timer->hw = snd_wss_timer_table; timer->hw = snd_wss_timer_table;
chip->timer = timer; chip->timer = timer;
if (rtimer)
*rtimer = timer;
return 0; return 0;
} }
EXPORT_SYMBOL(snd_wss_timer); EXPORT_SYMBOL(snd_wss_timer);