Changeset 621 for GPL/branches

Timestamp:

Jan 1, 2021, 11:45:33 PM (5 years ago)

Author:

Paul Smedley

Message:

Remove some logging messages

Location:

GPL/branches/uniaud32-next

Files:

• alsa-kernel/core/pcm_native.c (modified) (3 diffs)
• alsa-kernel/core/sound.c (modified) (3 diffs)
• alsa-kernel/hda/hdac_device.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_bind.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_codec.c (modified) (3 diffs)
• alsa-kernel/pci/hda/patch_sigmatel.c (modified) (3 diffs)
• lib32/ioctl.c (modified) (2 diffs)
• lib32/pci.c (modified) (5 diffs)
• lib32/regcache-rbtree.c (modified) (18 diffs)
• lib32/regcache.c (modified) (1 diff)
• lib32/regmap.c (modified) (2 diffs)
• lib32/sound.c (modified) (5 diffs)

GPL/branches/uniaud32-next/alsa-kernel/core/pcm_native.c

@@ -398 +398 @@
                 }
 
-pr_warn("constrain_params_by_rules");
                 changed = r->func(params, r);
-pr_warn("constrain_params_by_rules2");
                 if (changed < 0) {
                         err = changed;
@@ -3593 +3591 @@
                                       unsigned int cmd, unsigned long arg)
 {
-pr_warn("snd_pcm_playback_ioctl_old");
         int err;
         err = snd_pcm_ioctl(file, cmd, arg);
@@ -3601 +3598 @@
                                       unsigned int cmd, unsigned long arg)
 {
-pr_warn("snd_pcm_capture_ioctl_old");
         int err;
         err = snd_pcm_ioctl(file, cmd, arg);

GPL/branches/uniaud32-next/alsa-kernel/core/sound.c

@@ -138 +138 @@
 {
         unsigned int minor = iminor(inode);
-pr_warn("snd_open - minor = %d",minor);
         struct snd_minor *mptr = NULL;
         const struct file_operations *new_fops;
         int err = 0;
 
-        if (minor >= ARRAY_SIZE(snd_minors)){
-pr_warn("snd_open - ENODEV");
-                return -ENODEV;}
+        if (minor >= ARRAY_SIZE(snd_minors))
+                return -ENODEV;
         mutex_lock(&sound_mutex);
         mptr = snd_minors[minor];
@@ -152 +150 @@
                 if (!mptr) {
                         mutex_unlock(&sound_mutex);
-pr_warn("snd_open - ENODEV2");
                         return -ENODEV;
                 }
@@ -180 +177 @@
                 err = file->f_op->open(inode, file);
                 if (err) {
-pr_warn("snd_open - file->f_op->open, err = %d",err);
                         fops_put(file->f_op);
                         file->f_op = fops_get(new_fops);

GPL/branches/uniaud32-next/alsa-kernel/hda/hdac_device.c

@@ -200 +200 @@
         kfree(codec->chip_name);
         codec->chip_name = newname;
-if (codec->chip_name && *codec->chip_name == 0x49)
-    pr_warn("codec->chip_name corrupted2");
         return 0;
 }

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_bind.c

@@ -78 +78 @@
                 codec->bus->mixer_assigned = codec->core.addr;
         }
-if (codec->core.chip_name && *codec->core.chip_name == 0x49)
-    pr_warn("codec->chip_name corrupted");
         return 0;
 }

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_codec.c

@@ -1303 +1303 @@
                                int ch, int dir, int idx)
 {
-//pr_warn("snd_hda_codec_amp_update");
         unsigned int cmd = snd_hdac_regmap_encode_amp(nid, ch, dir, idx);
 
@@ -2318 +2317 @@
 {
         const hda_nid_t *d;
-//pr_warn("set_dig_out");
         snd_hdac_regmap_update(&codec->core, nid, AC_VERB_SET_DIGI_CONVERT_1,
                                mask, val);
@@ -2486 +2484 @@
         struct hda_spdif_out *spdif;
         struct hda_bus *bus = codec->bus;
-//pr_warn("snd_hda_create_dig_out_ctls");
         if (bus->primary_dig_out_type == HDA_PCM_TYPE_HDMI &&
             type == HDA_PCM_TYPE_SPDIF) {

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/patch_sigmatel.c

@@ -4352 +4352 @@
 static int stac_parse_auto_config(struct hda_codec *codec)
 {
-pr_warn("stac_parse_auto_config");
         struct sigmatel_spec *spec = codec->spec;
         int err;
@@ -4437 +4436 @@
 static int stac_init(struct hda_codec *codec)
 {
-pr_warn("stac_init");
         struct sigmatel_spec *spec = codec->spec;
         int i;
@@ -4470 +4468 @@
                 }
         }
-pr_warn("stac_init - end");
         return 0;
 }

GPL/branches/uniaud32-next/lib32/ioctl.c

@@ -291 +291 @@
         for (i=0; i<pcms;i++)
         {
-pr_warn("pcm=%i",i);
                 pcaps->nrDevices  = nrCardsDetected;
                 pcaps->ulCaps     = OSS32_CAPS_WAVE_PLAYBACK | OSS32_CAPS_WAVE_CAPTURE;
@@ -298 +297 @@
                 for(j=0;j<2;j++)
                 {
-pr_warn("j=%i",j);
                         PWAVE_CAPS pWaveCaps = (j == 0) ? &pcaps->waveOutCaps : &pcaps->waveInCaps;
 

GPL/branches/uniaud32-next/lib32/pci.c

@@ -205 +205 @@
         pcidev->dev.dma_mask = &pcidev->dma_mask;
         pcidev->dev.coherent_dma_mask = 0xffffffffull;
-pr_warn("params set");
 
         // Subsystem ID
@@ -652 +651 @@
   dprintf(("pci_alloc_consistent %d mask %x", size, (hwdev) ? hwdev->dma_mask : 0));
   if (hwdev == NULL || hwdev->dma_mask != 0xffffffff) {
-  dprintf(("pci_alloc_consistent"));
-pr_warn("dma_mask = %x",hwdev->dma_mask);
     //try not to exhaust low memory (< 16mb) so allocate from the high region first
     //if that doesn't satisfy the dma mask requirement, then get it from the low
     //region anyway
     if(hwdev->dma_mask > 0x00ffffff) {
-  dprintf(("pci_alloc_consistent2"));
       order = __compat_get_order(size);
-  dprintf(("pci_alloc_consistent3"));
       ret = (void *)__get_free_pages(gfp|GFP_DMAHIGHMEM, order);
-  dprintf(("pci_alloc_consistent4"));
       *dma_handle = virt_to_bus(ret);
       if(*dma_handle > hwdev->dma_mask) {
-  dprintf(("pci_alloc_consistent5"));
         free_pages((unsigned long)ret, __compat_get_order(size));
-  dprintf(("pci_alloc_consistent6"));
         //be sure and allocate below 16 mb
         gfp |= GFP_DMA;
         ret = NULL;
       }
-  dprintf(("pci_alloc_consistent6a"));
     }
     else { //must always allocate below 16 mb
-  dprintf(("pci_alloc_consistent7"));
       gfp |= GFP_DMA;
     }
-  dprintf(("pci_alloc_consistent7a"));
-  }
-  dprintf(("pci_alloc_consistent8"));
+  }
   if(ret == NULL) {
-  dprintf(("pci_alloc_consistent9"));
     ret = (void *)__get_free_pages(gfp, __compat_get_order(size));
   }
-  dprintf(("pci_alloc_consistent10"));
   if (ret != NULL) {
-  dprintf(("pci_alloc_consistent11"));
     memset(ret, 0, size);
     *dma_handle = virt_to_bus(ret);
@@ -749 +734 @@
 int dma_supported(struct device *dev, u64 mask)
 {
-pr_warn("dma_supported");
   return 1;
 }
@@ -755 +739 @@
 int dma_set_coherent_mask(struct device *dev, u64 mask)
 {
-pr_warn("dma_set_coherent_mask");
         /*
          * Truncate the mask to the actually supported dma_addr_t width to
@@ -771 +754 @@
 int dma_set_mask(struct device *dev, u64 mask)
 {
-pr_warn("dma_set_mask");
         /*
          * Truncate the mask to the actually supported dma_addr_t width to

GPL/branches/uniaud32-next/lib32/regcache-rbtree.c

@@ -85 +85 @@
         struct regcache_rbtree_node *rbnode;
         unsigned int base_reg, top_reg;
-//pr_warn("regcache_rbtree_lookup");
+
         rbnode = rbtree_ctx->cached_rbnode;
         if (rbnode) {
                 regcache_rbtree_get_base_top_reg(map, rbnode, &base_reg,
                                                  &top_reg);
-//pr_warn("regcache_rbtree_lookup reg = %u, base_reg = %u, top_reg = %u", reg, base_reg, top_reg);
                 if (reg >= base_reg && reg <= top_reg)
                         return rbnode;
@@ -100 +99 @@
                 regcache_rbtree_get_base_top_reg(map, rbnode, &base_reg,
                                                  &top_reg);
-//pr_warn("regcache_rbtree_lookup2 reg = %x, base_reg = %x, top_reg = %x", reg, base_reg, top_reg);
                 if (reg >= base_reg && reg <= top_reg) {
                         rbtree_ctx->cached_rbnode = rbnode;
@@ -110 +108 @@
                 }
         }
-//pr_warn("regcache_rbtree_lookup - NULL");
         return NULL;
 }
@@ -121 +118 @@
         unsigned int base_reg_tmp, top_reg_tmp;
         unsigned int base_reg;
-//pr_warn("regcache_rbtree_insert");
+
         parent = NULL;
         new = &root->rb_node;
-//pr_warn("regcache_rbtree_insert - new = %x",new);
+
         while (*new) {
-//pr_warn("regcache_rbtree_insert2");
                 rbnode_tmp = rb_entry(*new, struct regcache_rbtree_node, node);
                 /* base and top registers of the current rbnode */
@@ -135 +131 @@
                 parent = *new;
                 /* if this register has already been inserted, just return */
-//pr_warn("regcache_rbtree_insert - base_reg = %u, base_reg_tmp = %u, top_reg_tmp = %u", base_reg, base_reg_tmp, top_reg_tmp);
                 if (base_reg >= base_reg_tmp &&
                     base_reg <= top_reg_tmp)
@@ -220 +215 @@
         int i;
         int ret;
-//pr_warn("regcache_rbtree_init");
 #ifdef TARGET_OS2
         // 2020-11-17 SHL FIXME patched struct rb_root
@@ -239 +233 @@
 #endif
         rbtree_ctx->cached_rbnode = NULL;
-//pr_warn("regcache_rbtree_init - num_reg_defaults = %x",map->num_reg_defaults);
         for (i = 0; i < map->num_reg_defaults; i++) {
                 ret = regcache_rbtree_write(map,
@@ -289 +282 @@
         struct regcache_rbtree_node *rbnode;
         unsigned int reg_tmp;
-//pr_warn("regcache_rbtree_read");
+
         rbnode = regcache_rbtree_lookup(map, reg);
         if (rbnode) {
                 reg_tmp = (reg - rbnode->base_reg) / map->reg_stride;
-                if (!test_bit(reg_tmp, rbnode->cache_present)){
-//pr_warn("regcache_rbtree_read - -ENOENT");
-                        return -ENOENT;}
+                if (!test_bit(reg_tmp, rbnode->cache_present))
+                        return -ENOENT;
                 *value = regcache_rbtree_get_register(map, rbnode, reg_tmp);
         } else {
-//pr_warn("regcache_rbtree_read2 - -ENOENT");
                 return -ENOENT;
         }
-//pr_warn("regcache_rbtree_read - success");
         return 0;
 }
@@ -317 +307 @@
         unsigned long *present;
         u8 *blk;
-//pr_warn("regcache_rbtree_insert_to_block");
+
         blklen = (top_reg - base_reg) / map->reg_stride + 1;
         pos = (reg - base_reg) / map->reg_stride;
@@ -367 +357 @@
         const struct regmap_range *range;
         int i;
-//pr_warn("regcache_rbtree_node_alloc");
+
         rbnode = kzalloc(sizeof(*rbnode), GFP_KERNEL);
         if (!rbnode)
                 return NULL;
-//pr_warn("regcache_rbtree_node_alloc2");
+
         /* If there is a read table then use it to guess at an allocation */
         if (map->rd_table) {
-//pr_warn("regcache_rbtree_node_alloc3");
                 for (i = 0; i < map->rd_table->n_yes_ranges; i++) {
                         if (regmap_reg_in_range(reg,
@@ -380 +369 @@
                                 break;
                 }
-//pr_warn("regcache_rbtree_node_alloc4");
                 if (i != map->rd_table->n_yes_ranges) {
                         range = &map->rd_table->yes_ranges[i];
@@ -389 +377 @@
         }
         if (!rbnode->blklen) {
-//pr_warn("regcache_rbtree_node_alloc5");
                 rbnode->blklen = 1;
                 rbnode->base_reg = reg;
@@ -422 +409 @@
         unsigned int reg_tmp;
         int ret;
-//pr_warn("regcache_rbtree_write, reg = %u, value = %u", reg, value);
+
         rbtree_ctx = map->cache;
 
@@ -429 +416 @@
          */
         rbnode = regcache_rbtree_lookup(map, reg);
-//pr_warn("regcache_rbtree_write - rbnode = %x",rbnode);
         if (rbnode) {
-//pr_warn("regcache_rbtree_write - got rbnode");
                 reg_tmp = (reg - rbnode->base_reg) / map->reg_stride;
                 regcache_rbtree_set_register(map, rbnode, reg_tmp, value);
         } else {
-//pr_warn("regcache_rbtree_write - no rbnode");
                 unsigned int base_reg, top_reg;
                 unsigned int new_base_reg, new_top_reg;
@@ -453 +437 @@
                 node = rbtree_ctx->root.rb_node;
                 while (node) {
-//pr_warn("regcache_rbtree_write - no rbnode2");
                         rbnode_tmp = rb_entry(node, struct regcache_rbtree_node,
                                               node);
@@ -494 +477 @@
                                                               value);
                         if (ret){
-//pr_warn("regcache_write - ret from regcache_rbtree_insert_to_block = %d",ret);
                                 return ret;}
                         rbtree_ctx->cached_rbnode = rbnode;
-//pr_warn("regcache_write - rbtree_ctx->cached_rbnode = %x",rbtree_ctx->cached_rbnode);
                         return 0;
                 }
@@ -506 +487 @@
                 rbnode = regcache_rbtree_node_alloc(map, reg);
                 if (!rbnode){
-//pr_warn("regcache_write - ENOMEM");
                         return -ENOMEM;}
                 regcache_rbtree_set_register(map, rbnode,
@@ -513 +493 @@
                 rbtree_ctx->cached_rbnode = rbnode;
         }
-//pr_warn("regcache_write - rbtree_ctx->cached_rbnode2 = %x",rbtree_ctx->cached_rbnode);
         return 0;
 }

GPL/branches/uniaud32-next/lib32/regcache.c

@@ -643 +643 @@
         key.reg = reg;
         key.def = 0;
-//pr_warn("regcache_lookup_reg - map->num_reg_defaults = %x",map->num_reg_defaults);
+
         r = bsearch(&key, map->reg_defaults, map->num_reg_defaults,
                     sizeof(struct reg_default), regcache_default_cmp);

GPL/branches/uniaud32-next/lib32/regmap.c

@@ -623 +623 @@
         struct rb_root _RB_ROOT = { NULL, };
 #endif
-////pr_warn("__regmap_init");
 
         if (!config)
@@ -951 +950 @@
         memset(&map->range_tree, 0, sizeof(struct rb_root));
 #endif
-//pr_warn("config->num_ranges = %u",config->num_ranges);
+
         for (i = 0; i < config->num_ranges; i++) {
                 const struct regmap_range_cfg *range_cfg = &config->ranges[i];
-//pr_warn("config->num_ranges = %u, range_cfg->range_max = %u, range_cfg->range_min = %u",config->num_ranges, range_cfg->range_max, range_cfg->range_min);
                 struct regmap_range_node *new;
 

GPL/branches/uniaud32-next/lib32/sound.c

@@ -489 +489 @@
         soundhandle *pHandle;
         int              ret,i;
-pr_warn("OSS32_WaveOpen");
+
         if (pStreamId)
                 *pStreamId = 0;
@@ -524 +524 @@
         switch(streamtype) {
         case OSS32_STREAM_WAVEOUT:
-pr_warn("OSS32_WaveOpen - OSS32_STREAM_WAVEOUT");
                 pHandle->file.f_mode  = FMODE_WRITE;
                 pHandle->inode.i_rdev = SNDRV_MINOR(deviceid, SNDRV_MINOR_PCM_PLAYBACK) + pcm;
                 break;
         case OSS32_STREAM_WAVEIN:
-pr_warn("OSS32_WaveOpen - OSS32_STREAM_WAVEIN");
                 pHandle->file.f_mode  = FMODE_READ;
                 pHandle->inode.i_rdev = SNDRV_MINOR(deviceid, SNDRV_MINOR_PCM_CAPTURE) + pcm;
@@ -541 +539 @@
 
         ret = alsa_fops->open(&pHandle->inode, &pHandle->file);
-pr_warn("OSS32_WaveOpen. ret: %i\n", ret);
+
         //dprintf(("OSS32_WaveOpen. ret: %i\n", ret));
         /* check if PCM already opened (stupid uniaud16.sys doesnt closes it) */
@@ -624 +622 @@
                         if (!opened_handles[i].reuse)
                         {
-pr_warn("here");
                                 ret = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
                                 opened_handles[i].handle = 0;
@@ -632 +629 @@
 #endif
                         {
-pr_warn("here2");
                                 /* prepare for reuse */
                                 pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_RESET, 0);