Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 622207dc31895b4e82c39100db8635d885c795e2

Authored by Takashi Iwai
Committed by Jaroslav Kysela
1 parent 7eaa943c8e
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ALSA: Kill snd_assert() in sound/isa/* 

Kill snd_assert() in sound/isa/*, either removed or replaced with
if () with snd_BUG_ON().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

Showing 18 changed files with 80 additions and 42 deletions Side-by-side Diff

sound/isa/ad1816a/ad1816a_lib.c
Diff comments   View file @ 622207d
... ... @@ -394,7 +394,8 @@
394 394  
395 395 static unsigned long snd_ad1816a_timer_resolution(struct snd_timer *timer)
396 396 {
397   - snd_assert(timer != NULL, return 0);
  397 + if (snd_BUG_ON(!timer))
  398 + return 0;
398 399  
399 400 return 10000;
400 401 }
... ... @@ -961,7 +962,8 @@
961 962 unsigned int idx;
962 963 int err;
963 964  
964   - snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
  965 + if (snd_BUG_ON(!chip || !chip->card))
  966 + return -EINVAL;
965 967  
966 968 card = chip->card;
967 969  
sound/isa/cs423x/cs4236_lib.c
Diff comments   View file @ 622207d
... ... @@ -967,7 +967,8 @@
967 967 int err;
968 968 struct snd_kcontrol_new *kcontrol;
969 969  
970   - snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
  970 + if (snd_BUG_ON(!chip || !chip->card))
  971 + return -EINVAL;
971 972 card = chip->card;
972 973 strcpy(card->mixername, snd_wss_chip_id(chip));
973 974  
sound/isa/es1688/es1688_lib.c
Diff comments   View file @ 622207d
... ... @@ -1009,7 +1009,8 @@
1009 1009 int err;
1010 1010 unsigned char reg, val;
1011 1011  
1012   - snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
  1012 + if (snd_BUG_ON(!chip || !chip->card))
  1013 + return -EINVAL;
1013 1014  
1014 1015 card = chip->card;
1015 1016  
sound/isa/gus/gus_main.c
Diff comments   View file @ 622207d
... ... @@ -276,9 +276,11 @@
276 276 static unsigned char dmas[8] =
277 277 {6, 1, 0, 2, 0, 3, 4, 5};
278 278  
279   - snd_assert(gus != NULL, return -EINVAL);
  279 + if (snd_BUG_ON(!gus))
  280 + return -EINVAL;
280 281 card = gus->card;
281   - snd_assert(card != NULL, return -EINVAL);
  282 + if (snd_BUG_ON(!card))
  283 + return -EINVAL;
282 284  
283 285 gus->mix_cntrl_reg &= 0xf8;
284 286 gus->mix_cntrl_reg |= 0x01; /* disable MIC, LINE IN, enable LINE OUT */
sound/isa/gus/gus_mixer.c
Diff comments   View file @ 622207d
... ... @@ -161,9 +161,11 @@
161 161 unsigned int idx, max;
162 162 int err;
163 163  
164   - snd_assert(gus != NULL, return -EINVAL);
  164 + if (snd_BUG_ON(!gus))
  165 + return -EINVAL;
165 166 card = gus->card;
166   - snd_assert(card != NULL, return -EINVAL);
  167 + if (snd_BUG_ON(!card))
  168 + return -EINVAL;
167 169  
168 170 if (gus->ics_flag)
169 171 snd_component_add(card, "ICS2101");
sound/isa/gus/gus_pcm.c
Diff comments   View file @ 622207d
... ... @@ -352,8 +352,10 @@
352 352  
353 353 bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
354 354 len = samples_to_bytes(runtime, count);
355   - snd_assert(bpos <= pcmp->dma_size, return -EIO);
356   - snd_assert(bpos + len <= pcmp->dma_size, return -EIO);
  355 + if (snd_BUG_ON(bpos > pcmp->dma_size))
  356 + return -EIO;
  357 + if (snd_BUG_ON(bpos + len > pcmp->dma_size))
  358 + return -EIO;
357 359 if (copy_from_user(runtime->dma_area + bpos, src, len))
358 360 return -EFAULT;
359 361 if (snd_gf1_pcm_use_dma && len > 32) {
... ... @@ -381,8 +383,10 @@
381 383  
382 384 bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
383 385 len = samples_to_bytes(runtime, count);
384   - snd_assert(bpos <= pcmp->dma_size, return -EIO);
385   - snd_assert(bpos + len <= pcmp->dma_size, return -EIO);
  386 + if (snd_BUG_ON(bpos > pcmp->dma_size))
  387 + return -EIO;
  388 + if (snd_BUG_ON(bpos + len > pcmp->dma_size))
  389 + return -EIO;
386 390 snd_pcm_format_set_silence(runtime->format, runtime->dma_area + bpos, count);
387 391 if (snd_gf1_pcm_use_dma && len > 32) {
388 392 return snd_gf1_pcm_block_change(substream, bpos, pcmp->memory + bpos, len);
sound/isa/opti9xx/miro.c
Diff comments   View file @ 622207d
... ... @@ -675,7 +675,8 @@
675 675 unsigned int idx;
676 676 int err;
677 677  
678   - snd_assert(miro != NULL && miro->card != NULL, return -EINVAL);
  678 + if (snd_BUG_ON(!miro || !miro->card))
  679 + return -EINVAL;
679 680  
680 681 card = miro->card;
681 682  
sound/isa/sb/emu8000.c
Diff comments   View file @ 622207d
... ... @@ -1023,7 +1023,8 @@
1023 1023 {
1024 1024 int i, err = 0;
1025 1025  
1026   - snd_assert(emu != NULL && card != NULL, return -EINVAL);
  1026 + if (snd_BUG_ON(!emu || !card))
  1027 + return -EINVAL;
1027 1028  
1028 1029 spin_lock_init(&emu->control_lock);
1029 1030  
sound/isa/sb/emu8000_patch.c
Diff comments   View file @ 622207d
... ... @@ -156,7 +156,8 @@
156 156 struct snd_emu8000 *emu;
157 157  
158 158 emu = rec->hw;
159   - snd_assert(sp != NULL, return -EINVAL);
  159 + if (snd_BUG_ON(!sp))
  160 + return -EINVAL;
160 161  
161 162 if (sp->v.size == 0)
162 163 return 0;
sound/isa/sb/sb16_csp.c
Diff comments   View file @ 622207d
... ... @@ -198,7 +198,8 @@
198 198 struct snd_sb_csp_start start_info;
199 199 int err;
200 200  
201   - snd_assert(p != NULL, return -EINVAL);
  201 + if (snd_BUG_ON(!p))
  202 + return -EINVAL;
202 203  
203 204 if (snd_sb_csp_check_version(p))
204 205 return -ENODEV;
... ... @@ -1046,7 +1047,8 @@
1046 1047 struct snd_card *card;
1047 1048 int err;
1048 1049  
1049   - snd_assert(p != NULL, return -EINVAL);
  1050 + if (snd_BUG_ON(!p))
  1051 + return -EINVAL;
1050 1052  
1051 1053 card = p->chip->card;
1052 1054 p->qpos_left = p->qpos_right = SNDRV_SB_CSP_QSOUND_MAX_RIGHT / 2;
... ... @@ -1071,7 +1073,8 @@
1071 1073 struct snd_card *card;
1072 1074 unsigned long flags;
1073 1075  
1074   - snd_assert(p != NULL, return);
  1076 + if (snd_BUG_ON(!p))
  1077 + return;
1075 1078  
1076 1079 card = p->chip->card;
1077 1080  
sound/isa/sb/sb16_main.c
Diff comments   View file @ 622207d
... ... @@ -669,7 +669,8 @@
669 669 static int snd_sb16_set_dma_mode(struct snd_sb *chip, int what)
670 670 {
671 671 if (chip->dma8 < 0 || chip->dma16 < 0) {
672   - snd_assert(what == 0, return -EINVAL);
  672 + if (snd_BUG_ON(what))
  673 + return -EINVAL;
673 674 return 0;
674 675 }
675 676 if (what == 0) {
sound/isa/sb/sb8_main.c
Diff comments   View file @ 622207d
... ... @@ -111,7 +111,9 @@
111 111 switch (chip->hardware) {
112 112 case SB_HW_PRO:
113 113 if (runtime->channels > 1) {
114   - snd_assert(rate == SB8_RATE(11025) || rate == SB8_RATE(22050), return -EINVAL);
  114 + if (snd_BUG_ON(rate != SB8_RATE(11025) &&
  115 + rate != SB8_RATE(22050)))
  116 + return -EINVAL;
115 117 chip->playback_format = SB_DSP_HI_OUTPUT_AUTO;
116 118 break;
117 119 }
... ... @@ -237,7 +239,9 @@
237 239 switch (chip->hardware) {
238 240 case SB_HW_PRO:
239 241 if (runtime->channels > 1) {
240   - snd_assert(rate == SB8_RATE(11025) || rate == SB8_RATE(22050), return -EINVAL);
  242 + if (snd_BUG_ON(rate != SB8_RATE(11025) &&
  243 + rate != SB8_RATE(22050)))
  244 + return -EINVAL;
241 245 chip->capture_format = SB_DSP_HI_INPUT_AUTO;
242 246 break;
243 247 }
sound/isa/sb/sb_common.c
Diff comments   View file @ 622207d
... ... @@ -219,7 +219,8 @@
219 219 .dev_free = snd_sbdsp_dev_free,
220 220 };
221 221  
222   - snd_assert(r_chip != NULL, return -EINVAL);
  222 + if (snd_BUG_ON(!r_chip))
  223 + return -EINVAL;
223 224 *r_chip = NULL;
224 225 chip = kzalloc(sizeof(*chip), GFP_KERNEL);
225 226 if (chip == NULL)
sound/isa/sb/sb_mixer.c
Diff comments   View file @ 622207d
... ... @@ -792,7 +792,8 @@
792 792 struct snd_card *card;
793 793 int err;
794 794  
795   - snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
  795 + if (snd_BUG_ON(!chip || !chip->card))
  796 + return -EINVAL;
796 797  
797 798 card = chip->card;
798 799  
... ... @@ -925,7 +926,8 @@
925 926 static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)
926 927 {
927 928 unsigned char *val = chip->saved_regs;
928   - snd_assert(num_regs <= ARRAY_SIZE(chip->saved_regs), return);
  929 + if (snd_BUG_ON(num_regs > ARRAY_SIZE(chip->saved_regs)))
  930 + return;
929 931 for (; num_regs; num_regs--)
930 932 *val++ = snd_sbmixer_read(chip, *regs++);
931 933 }
... ... @@ -933,7 +935,8 @@
933 935 static void restore_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)
934 936 {
935 937 unsigned char *val = chip->saved_regs;
936   - snd_assert(num_regs <= ARRAY_SIZE(chip->saved_regs), return);
  938 + if (snd_BUG_ON(num_regs > ARRAY_SIZE(chip->saved_regs)))
  939 + return;
937 940 for (; num_regs; num_regs--)
938 941 snd_sbmixer_write(chip, *regs++, *val++);
939 942 }
sound/isa/wavefront/wavefront_fx.c
Diff comments   View file @ 622207d
... ... @@ -180,11 +180,11 @@
180 180 unsigned short *pd;
181 181 int err = 0;
182 182  
183   - snd_assert(sdev->card != NULL, return -ENODEV);
184   -
185 183 card = sdev->card;
186   -
187   - snd_assert(card->private_data != NULL, return -ENODEV);
  184 + if (snd_BUG_ON(!card))
  185 + return -ENODEV;
  186 + if (snd_BUG_ON(!card->private_data))
  187 + return -ENODEV;
188 188  
189 189 acard = card->private_data;
190 190 dev = &acard->wavefront;
sound/isa/wavefront/wavefront_midi.c
Diff comments   View file @ 622207d
... ... @@ -235,8 +235,10 @@
235 235 snd_wavefront_midi_t *midi;
236 236 snd_wavefront_mpu_id mpu;
237 237  
238   - snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
239   - snd_assert(substream->rmidi->private_data != NULL, return -EIO);
  238 + if (snd_BUG_ON(!substream || !substream->rmidi))
  239 + return -ENXIO;
  240 + if (snd_BUG_ON(!substream->rmidi->private_data))
  241 + return -ENXIO;
240 242  
241 243 mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
242 244  
... ... @@ -257,8 +259,10 @@
257 259 snd_wavefront_midi_t *midi;
258 260 snd_wavefront_mpu_id mpu;
259 261  
260   - snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
261   - snd_assert(substream->rmidi->private_data != NULL, return -EIO);
  262 + if (snd_BUG_ON(!substream || !substream->rmidi))
  263 + return -ENXIO;
  264 + if (snd_BUG_ON(!substream->rmidi->private_data))
  265 + return -ENXIO;
262 266  
263 267 mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
264 268  
... ... @@ -279,8 +283,10 @@
279 283 snd_wavefront_midi_t *midi;
280 284 snd_wavefront_mpu_id mpu;
281 285  
282   - snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
283   - snd_assert(substream->rmidi->private_data != NULL, return -EIO);
  286 + if (snd_BUG_ON(!substream || !substream->rmidi))
  287 + return -ENXIO;
  288 + if (snd_BUG_ON(!substream->rmidi->private_data))
  289 + return -ENXIO;
284 290  
285 291 mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
286 292  
... ... @@ -300,8 +306,10 @@
300 306 snd_wavefront_midi_t *midi;
301 307 snd_wavefront_mpu_id mpu;
302 308  
303   - snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
304   - snd_assert(substream->rmidi->private_data != NULL, return -EIO);
  309 + if (snd_BUG_ON(!substream || !substream->rmidi))
  310 + return -ENXIO;
  311 + if (snd_BUG_ON(!substream->rmidi->private_data))
  312 + return -ENXIO;
305 313  
306 314 mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
307 315  
sound/isa/wavefront/wavefront_synth.c
Diff comments   View file @ 622207d
... ... @@ -1648,9 +1648,10 @@
1648 1648  
1649 1649 card = (struct snd_card *) hw->card;
1650 1650  
1651   - snd_assert(card != NULL, return -ENODEV);
1652   -
1653   - snd_assert(card->private_data != NULL, return -ENODEV);
  1651 + if (snd_BUG_ON(!card))
  1652 + return -ENODEV;
  1653 + if (snd_BUG_ON(!card->private_data))
  1654 + return -ENODEV;
1654 1655  
1655 1656 acard = card->private_data;
1656 1657 dev = &acard->wavefront;
sound/isa/wss/wss_lib.c
Diff comments   View file @ 622207d
... ... @@ -1946,7 +1946,8 @@
1946 1946 char **ptexts = texts;
1947 1947 struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
1948 1948  
1949   - snd_assert(chip->card != NULL, return -EINVAL);
  1949 + if (snd_BUG_ON(!chip->card))
  1950 + return -EINVAL;
1950 1951 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
1951 1952 uinfo->count = 2;
1952 1953 uinfo->value.enumerated.items = 4;
... ... @@ -2262,7 +2263,8 @@
2262 2263 unsigned int idx;
2263 2264 int err;
2264 2265  
2265   - snd_assert(chip != NULL && chip->pcm != NULL, return -EINVAL);
  2266 + if (snd_BUG_ON(!chip || !chip->pcm))
  2267 + return -EINVAL;
2266 2268  
2267 2269 card = chip->card;
2268 2270