diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_codec.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_codec.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_codec.c 2008-05-09 07:34:30.000000000 +0300
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_codec.c 2010-12-24 15:49:34.000000000 +0200
@@ -19,7 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
@@ -194,7 +193,7 @@ int snd_hda_get_connections(struct hda_c
unsigned int shift, num_elems, mask;
hda_nid_t prev_nid;
- snd_assert(conn_list && max_conns > 0, return -EINVAL);
+ if (snd_BUG_ON(!(conn_list && max_conns > 0))) { return -EINVAL; };
parm = snd_hda_param_read(codec, nid, AC_PAR_CONNLIST_LEN);
if (parm & AC_CLIST_LONG) {
@@ -439,8 +438,8 @@ int snd_hda_bus_new(struct snd_card *car
};
//printk(KERN_ERR"%s: card=%p\n", __FUNCTION__, card);
- snd_assert(temp, return -EINVAL);
- snd_assert(temp->ops.command && temp->ops.get_response, return -EINVAL);
+ if (snd_BUG_ON(!(temp))) { return -EINVAL; };
+ if (snd_BUG_ON(!(temp->ops.command && temp->ops.get_response))) { return -EINVAL; };
if (busp)
*busp = NULL;
@@ -604,8 +603,8 @@ int snd_hda_codec_new(struct hda_bus *bu
char component[13];
int err;
- snd_assert(bus, return -EINVAL);
- snd_assert(codec_addr <= HDA_MAX_CODEC_ADDRESS, return -EINVAL);
+ if (snd_BUG_ON(!(bus))) { return -EINVAL; };
+ if (snd_BUG_ON(!(codec_addr <= HDA_MAX_CODEC_ADDRESS))) { return -EINVAL; };
if (bus->caddr_tbl[codec_addr]) {
snd_printk(KERN_ERR "hda_codec: address 0x%x is already occupied\n", codec_addr);
@@ -1750,11 +1749,11 @@ static int set_pcm_default_values(struct
if (info->ops.close == NULL)
info->ops.close = hda_pcm_default_open_close;
if (info->ops.prepare == NULL) {
- snd_assert(info->nid, return -EINVAL);
+ if (snd_BUG_ON(!(info->nid))) { return -EINVAL; };
info->ops.prepare = hda_pcm_default_prepare;
}
if (info->ops.cleanup == NULL) {
- snd_assert(info->nid, return -EINVAL);
+ if (snd_BUG_ON(!(info->nid))) { return -EINVAL; };
info->ops.cleanup = hda_pcm_default_cleanup;
}
return 0;
@@ -1944,7 +1943,7 @@ int snd_hda_ch_mode_put(struct hda_codec
unsigned int mode;
mode = ucontrol->value.enumerated.item[0];
- snd_assert(mode < num_chmodes, return -EINVAL);
+ if (snd_BUG_ON(!(mode < num_chmodes))) { return -EINVAL; };
if (*max_channelsp == chmode[mode].channels && ! codec->in_resume)
return 0;
/* change the current channel setting */
diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_generic.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_generic.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_generic.c 2007-04-13 07:01:17.000000000 +0300
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_generic.c 2010-12-24 15:49:34.000000000 +0200
@@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/pci.h>
@@ -170,7 +169,7 @@ static int build_afg_tree(struct hda_cod
int i, nodes, err;
hda_nid_t nid;
- snd_assert(spec, return -EINVAL);
+ if (snd_BUG_ON(!(spec))) { return -EINVAL; };
spec->def_amp_out_caps = snd_hda_param_read(codec, codec->afg, AC_PAR_AMP_OUT_CAP);
spec->def_amp_in_caps = snd_hda_param_read(codec, codec->afg, AC_PAR_AMP_IN_CAP);
diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_intel.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_intel.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_intel.c 2007-04-14 19:46:11.000000000 +0300
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_intel.c 2010-12-24 16:16:37.000000000 +0200
@@ -33,7 +33,6 @@
*
*/
-#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
@@ -1326,7 +1325,7 @@ static int __devinit create_codec_pcm(st
if (!cpcm->stream[0].substreams && !cpcm->stream[1].substreams)
return 0;
- snd_assert(cpcm->name, return -EINVAL);
+ if (snd_BUG_ON(!(cpcm->name))) { return -EINVAL; };
err = snd_pcm_new(chip->card, cpcm->name, pcm_dev,
cpcm->stream[0].substreams, cpcm->stream[1].substreams,
@@ -1778,8 +1777,8 @@ static int __devinit azx_probe(struct pc
struct azx *chip;
int err;
- card = snd_card_new(index, id, THIS_MODULE, 0);
- if (!card) {
+ snd_card_create(index, id, THIS_MODULE, 0, &card);
+ if (card<0) {
snd_printk(KERN_ERR SFX "Error creating card!\n");
return -ENOMEM;
}
diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_proc.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_proc.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_proc.c 2007-04-14 19:46:11.000000000 +0300
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_proc.c 2010-12-24 15:49:34.000000000 +0200
@@ -21,7 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <sound/core.h>
diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_analog.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_analog.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_analog.c 2007-09-24 19:49:58.000000000 +0300
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_analog.c 2010-12-24 15:49:34.000000000 +0200
@@ -19,7 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_atihdmi.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_atihdmi.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_atihdmi.c 2007-04-13 07:01:17.000000000 +0300
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_atihdmi.c 2010-12-24 15:49:34.000000000 +0200
@@ -21,7 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_cmedia.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_cmedia.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_cmedia.c 2007-04-13 07:01:17.000000000 +0300
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_cmedia.c 2010-12-24 15:49:34.000000000 +0200
@@ -21,7 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_conexant.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_conexant.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_conexant.c 2007-11-17 04:22:38.000000000 +0200
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_conexant.c 2010-12-24 15:49:34.000000000 +0200
@@ -22,7 +22,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_realtek.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_realtek.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_realtek.c 2007-11-17 03:22:30.000000000 +0200
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_realtek.c 2010-12-24 15:49:34.000000000 +0200
@@ -23,7 +23,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
@@ -2097,12 +2096,12 @@ static int alc_build_pcms(struct hda_cod
info->name = spec->stream_name_analog;
if (spec->stream_analog_playback) {
- snd_assert(spec->multiout.dac_nids, return -EINVAL);
+ if (snd_BUG_ON(!(spec->multiout.dac_nids))) { return -EINVAL; };
info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_analog_playback);
info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
}
if (spec->stream_analog_capture) {
- snd_assert(spec->adc_nids, return -EINVAL);
+ if (snd_BUG_ON(!(spec->adc_nids))) { return -EINVAL; };
info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
}
diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_si3054.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_si3054.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_si3054.c 2007-04-13 07:01:17.000000000 +0300
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_si3054.c 2010-12-24 15:49:34.000000000 +0200
@@ -22,7 +22,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_sigmatel.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_sigmatel.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_sigmatel.c 2007-10-25 18:17:42.000000000 +0300
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_sigmatel.c 2010-12-24 15:49:34.000000000 +0200
@@ -24,7 +24,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_via.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_via.c
--- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_via.c 2007-04-14 19:46:11.000000000 +0300
+++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_via.c 2010-12-24 15:49:34.000000000 +0200
@@ -31,7 +31,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>