Skip to content

Commit

Permalink
ALSA: Kill snd_assert() in sound/pci/*
Browse files Browse the repository at this point in the history 
Kill snd_assert() in sound/pci/*, either removed or replaced with
if () with snd_BUG_ON().

Signed-off-by: Takashi Iwai <[email protected]>
Signed-off-by: Jaroslav Kysela <[email protected]>
  • Loading branch information
@tiwai @perexg
tiwai authored and perexg committed Aug 13, 2008
1 parent 622207d commit da3cec3
Show file tree
Hide file tree
Showing 70 changed files with 632 additions and 361 deletions.
19 changes: 12 additions & 7 deletions sound/pci/ac97/ac97_codec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1890,8 +1890,8 @@ int snd_ac97_bus(struct snd_card *card, int num, struct snd_ac97_bus_ops *ops,
.dev_free = snd_ac97_bus_dev_free,
};

snd_assert(card != NULL, return -EINVAL);
snd_assert(rbus != NULL, return -EINVAL);
if (snd_BUG_ON(!card))
return -EINVAL;
bus = kzalloc(sizeof(*bus), GFP_KERNEL);
if (bus == NULL)
return -ENOMEM;
Expand All @@ -1906,7 +1906,8 @@ int snd_ac97_bus(struct snd_card *card, int num, struct snd_ac97_bus_ops *ops,
snd_ac97_bus_free(bus);
return err;
}
*rbus = bus;
if (rbus)
*rbus = bus;
return 0;
}

Expand Down Expand Up @@ -1991,10 +1992,14 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
.dev_disconnect = snd_ac97_dev_disconnect,
};

snd_assert(rac97 != NULL, return -EINVAL);
*rac97 = NULL;
snd_assert(bus != NULL && template != NULL, return -EINVAL);
snd_assert(template->num < 4 && bus->codec[template->num] == NULL, return -EINVAL);
if (rac97)
*rac97 = NULL;
if (snd_BUG_ON(!bus || !template))
return -EINVAL;
if (snd_BUG_ON(template->num >= 4))
return -EINVAL;
if (bus->codec[template->num])
return -EBUSY;

card = bus->card;
ac97 = kzalloc(sizeof(*ac97), GFP_KERNEL);
Expand Down
6 changes: 4 additions & 2 deletions sound/pci/ad1889.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,8 @@ snd_ad1889_playback_pointer(struct snd_pcm_substream *ss)
ptr = ad1889_readl(chip, AD_DMA_WAVCA);
ptr -= chip->wave.addr;

snd_assert((ptr >= 0) && (ptr < chip->wave.size), return 0);
if (snd_BUG_ON(ptr >= chip->wave.size))
return 0;

return bytes_to_frames(ss->runtime, ptr);
}
Expand All @@ -567,7 +568,8 @@ snd_ad1889_capture_pointer(struct snd_pcm_substream *ss)
ptr = ad1889_readl(chip, AD_DMA_ADCCA);
ptr -= chip->ramc.addr;

snd_assert((ptr >= 0) && (ptr < chip->ramc.size), return 0);
if (snd_BUG_ON(ptr >= chip->ramc.size))
return 0;

return bytes_to_frames(ss->runtime, ptr);
}
Expand Down
10 changes: 6 additions & 4 deletions sound/pci/ak4531_codec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,10 @@ int __devinit snd_ak4531_mixer(struct snd_card *card,
.dev_free = snd_ak4531_dev_free,
};

snd_assert(rak4531 != NULL, return -EINVAL);
*rak4531 = NULL;
snd_assert(card != NULL && _ak4531 != NULL, return -EINVAL);
if (snd_BUG_ON(!card || !_ak4531))
return -EINVAL;
if (rak4531)
*rak4531 = NULL;
ak4531 = kzalloc(sizeof(*ak4531), GFP_KERNEL);
if (ak4531 == NULL)
return -ENOMEM;
Expand Down Expand Up @@ -428,7 +429,8 @@ int __devinit snd_ak4531_mixer(struct snd_card *card,
#if 0
snd_ak4531_dump(ak4531);
#endif
*rak4531 = ak4531;
if (rak4531)
*rak4531 = ak4531;
return 0;
}

Expand Down
10 changes: 7 additions & 3 deletions sound/pci/atiixp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,9 @@ static int snd_atiixp_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
struct atiixp_dma *dma = substream->runtime->private_data;
int err = 0;

snd_assert(dma->ops->enable_transfer && dma->ops->flush_dma, return -EINVAL);
if (snd_BUG_ON(!dma->ops->enable_transfer ||
!dma->ops->flush_dma))
return -EINVAL;

spin_lock(&chip->reg_lock);
switch (cmd) {
Expand Down Expand Up @@ -1032,7 +1034,8 @@ static int snd_atiixp_pcm_open(struct snd_pcm_substream *substream,
struct snd_pcm_runtime *runtime = substream->runtime;
int err;

snd_assert(dma->ops && dma->ops->enable_dma, return -EINVAL);
if (snd_BUG_ON(!dma->ops || !dma->ops->enable_dma))
return -EINVAL;

if (dma->opened)
return -EBUSY;
Expand Down Expand Up @@ -1064,7 +1067,8 @@ static int snd_atiixp_pcm_close(struct snd_pcm_substream *substream,
{
struct atiixp *chip = snd_pcm_substream_chip(substream);
/* disable DMA bits */
snd_assert(dma->ops && dma->ops->enable_dma, return -EINVAL);
if (snd_BUG_ON(!dma->ops || !dma->ops->enable_dma))
return -EINVAL;
spin_lock_irq(&chip->reg_lock);
dma->ops->enable_dma(chip, 0);
spin_unlock_irq(&chip->reg_lock);
Expand Down
10 changes: 7 additions & 3 deletions sound/pci/atiixp_modem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,9 @@ static int snd_atiixp_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
struct atiixp_dma *dma = substream->runtime->private_data;
int err = 0;

snd_assert(dma->ops->enable_transfer && dma->ops->flush_dma, return -EINVAL);
if (snd_BUG_ON(!dma->ops->enable_transfer ||
!dma->ops->flush_dma))
return -EINVAL;

spin_lock(&chip->reg_lock);
switch(cmd) {
Expand Down Expand Up @@ -865,7 +867,8 @@ static int snd_atiixp_pcm_open(struct snd_pcm_substream *substream,
.mask = 0,
};

snd_assert(dma->ops && dma->ops->enable_dma, return -EINVAL);
if (snd_BUG_ON(!dma->ops || !dma->ops->enable_dma))
return -EINVAL;

if (dma->opened)
return -EBUSY;
Expand Down Expand Up @@ -895,7 +898,8 @@ static int snd_atiixp_pcm_close(struct snd_pcm_substream *substream,
{
struct atiixp_modem *chip = snd_pcm_substream_chip(substream);
/* disable DMA bits */
snd_assert(dma->ops && dma->ops->enable_dma, return -EINVAL);
if (snd_BUG_ON(!dma->ops || !dma->ops->enable_dma))
return -EINVAL;
spin_lock_irq(&chip->reg_lock);
dma->ops->enable_dma(chip, 0);
spin_unlock_irq(&chip->reg_lock);
Expand Down
6 changes: 4 additions & 2 deletions sound/pci/azt3328.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,8 @@ snd_azf3328_mixer_new(struct snd_azf3328 *chip)
int err;

snd_azf3328_dbgcallenter();
snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
if (snd_BUG_ON(!chip || !chip->card))
return -EINVAL;

card = chip->card;

Expand Down Expand Up @@ -1471,7 +1472,8 @@ snd_azf3328_gameport_cooked_read(struct gameport *gameport,
u8 val;
unsigned long flags;

snd_assert(chip, return 0);
if (snd_BUG_ON(!chip))
return 0;

spin_lock_irqsave(&chip->reg_lock, flags);
val = snd_azf3328_game_inb(chip, IDX_GAME_LEGACY_COMPATIBLE);
Expand Down
20 changes: 14 additions & 6 deletions sound/pci/ca0106/ca_midi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ static int ca_midi_input_open(struct snd_rawmidi_substream *substream)
struct snd_ca_midi *midi = substream->rmidi->private_data;
unsigned long flags;

snd_assert(midi->dev_id, return -ENXIO);
if (snd_BUG_ON(!midi->dev_id))
return -ENXIO;
spin_lock_irqsave(&midi->open_lock, flags);
midi->midi_mode |= CA_MIDI_MODE_INPUT;
midi->substream_input = substream;
Expand All @@ -144,7 +145,8 @@ static int ca_midi_output_open(struct snd_rawmidi_substream *substream)
struct snd_ca_midi *midi = substream->rmidi->private_data;
unsigned long flags;

snd_assert(midi->dev_id, return -ENXIO);
if (snd_BUG_ON(!midi->dev_id))
return -ENXIO;
spin_lock_irqsave(&midi->open_lock, flags);
midi->midi_mode |= CA_MIDI_MODE_OUTPUT;
midi->substream_output = substream;
Expand All @@ -163,7 +165,8 @@ static int ca_midi_input_close(struct snd_rawmidi_substream *substream)
struct snd_ca_midi *midi = substream->rmidi->private_data;
unsigned long flags;

snd_assert(midi->dev_id, return -ENXIO);
if (snd_BUG_ON(!midi->dev_id))
return -ENXIO;
spin_lock_irqsave(&midi->open_lock, flags);
midi->interrupt_disable(midi,midi->rx_enable);
midi->midi_mode &= ~CA_MIDI_MODE_INPUT;
Expand All @@ -181,7 +184,9 @@ static int ca_midi_output_close(struct snd_rawmidi_substream *substream)
{
struct snd_ca_midi *midi = substream->rmidi->private_data;
unsigned long flags;
snd_assert(midi->dev_id, return -ENXIO);

if (snd_BUG_ON(!midi->dev_id))
return -ENXIO;

spin_lock_irqsave(&midi->open_lock, flags);

Expand All @@ -201,7 +206,9 @@ static int ca_midi_output_close(struct snd_rawmidi_substream *substream)
static void ca_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
{
struct snd_ca_midi *midi = substream->rmidi->private_data;
snd_assert(midi->dev_id, return);

if (snd_BUG_ON(!midi->dev_id))
return;

if (up) {
midi->interrupt_enable(midi,midi->rx_enable);
Expand All @@ -215,7 +222,8 @@ static void ca_midi_output_trigger(struct snd_rawmidi_substream *substream, int
struct snd_ca_midi *midi = substream->rmidi->private_data;
unsigned long flags;

snd_assert(midi->dev_id, return);
if (snd_BUG_ON(!midi->dev_id))
return;

if (up) {
int max = 4;
Expand Down
9 changes: 6 additions & 3 deletions sound/pci/cmipci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2357,7 +2357,8 @@ static int snd_cmipci_uswitch_get(struct snd_kcontrol *kcontrol,
{
struct cmipci_switch_args *args;
args = (struct cmipci_switch_args *)kcontrol->private_value;
snd_assert(args != NULL, return -EINVAL);
if (snd_BUG_ON(!args))
return -EINVAL;
return _snd_cmipci_uswitch_get(kcontrol, ucontrol, args);
}

Expand Down Expand Up @@ -2401,7 +2402,8 @@ static int snd_cmipci_uswitch_put(struct snd_kcontrol *kcontrol,
{
struct cmipci_switch_args *args;
args = (struct cmipci_switch_args *)kcontrol->private_value;
snd_assert(args != NULL, return -EINVAL);
if (snd_BUG_ON(!args))
return -EINVAL;
return _snd_cmipci_uswitch_put(kcontrol, ucontrol, args);
}

Expand Down Expand Up @@ -2662,7 +2664,8 @@ static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_devic
unsigned int idx;
int err;

snd_assert(cm != NULL && cm->card != NULL, return -EINVAL);
if (snd_BUG_ON(!cm || !cm->card))
return -EINVAL;

card = cm->card;

Expand Down
13 changes: 8 additions & 5 deletions sound/pci/cs4281.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -766,13 +766,13 @@ static void snd_cs4281_mode(struct cs4281 *chip, struct cs4281_dma *dma,
if (!capture) {
if (dma->left_slot == chip->src_left_play_slot) {
unsigned int val = snd_cs4281_rate(runtime->rate, NULL);
snd_assert(dma->right_slot == chip->src_right_play_slot, );
snd_BUG_ON(dma->right_slot != chip->src_right_play_slot);
snd_cs4281_pokeBA0(chip, BA0_DACSR, val);
}
} else {
if (dma->left_slot == chip->src_left_rec_slot) {
unsigned int val = snd_cs4281_rate(runtime->rate, NULL);
snd_assert(dma->right_slot == chip->src_right_rec_slot, );
snd_BUG_ON(dma->right_slot != chip->src_right_rec_slot);
snd_cs4281_pokeBA0(chip, BA0_ADCSR, val);
}
}
Expand Down Expand Up @@ -1209,15 +1209,17 @@ static void snd_cs4281_gameport_trigger(struct gameport *gameport)
{
struct cs4281 *chip = gameport_get_port_data(gameport);

snd_assert(chip, return);
if (snd_BUG_ON(!chip))
return;
snd_cs4281_pokeBA0(chip, BA0_JSPT, 0xff);
}

static unsigned char snd_cs4281_gameport_read(struct gameport *gameport)
{
struct cs4281 *chip = gameport_get_port_data(gameport);

snd_assert(chip, return 0);
if (snd_BUG_ON(!chip))
return 0;
return snd_cs4281_peekBA0(chip, BA0_JSPT);
}

Expand All @@ -1228,7 +1230,8 @@ static int snd_cs4281_gameport_cooked_read(struct gameport *gameport,
struct cs4281 *chip = gameport_get_port_data(gameport);
unsigned js1, js2, jst;

snd_assert(chip, return 0);
if (snd_BUG_ON(!chip))
return 0;

js1 = snd_cs4281_peekBA0(chip, BA0_JSC1);
js2 = snd_cs4281_peekBA0(chip, BA0_JSC2);
Expand Down
Loading

0 comments on commit da3cec3

Please sign in to comment.