Merge branch 'for-next' into for-linus

4.18-rc1 merge material.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

4 files changed, 10 insertions, 10 deletions

diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c
index 655fbea1692c..4910d3f46d4b 100644
--- a/sound/pci/cs46xx/cs46xx.c
+++ b/sound/pci/cs46xx/cs46xx.c
@@ -58,7 +58,7 @@ MODULE_PARM_DESC(id, "ID string for the CS46xx soundcard.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable CS46xx soundcard.");
 module_param_array(external_amp, bool, NULL, 0444);
-MODULE_PARM_DESC(external_amp, "Force to enable external amplifer.");
+MODULE_PARM_DESC(external_amp, "Force to enable external amplifier.");
 module_param_array(thinkpad, bool, NULL, 0444);
 MODULE_PARM_DESC(thinkpad, "Force to enable Thinkpad's CLKRUN control.");
 module_param_array(mmap_valid, bool, NULL, 0444);
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 0020fd0efc46..ed1251c5f449 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -2849,7 +2849,7 @@ static int snd_cs46xx_proc_init(struct snd_card *card, struct snd_cs46xx *chip)
                         entry->private_data = chip;
                         entry->c.ops = &snd_cs46xx_proc_io_ops;
                         entry->size = region->size;
-                        entry->mode = S_IFREG | S_IRUSR;
+                        entry->mode = S_IFREG | 0400;
                 }
         }
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c
index aa61615288ff..c44eadef64ae 100644
--- a/sound/pci/cs46xx/dsp_spos.c
+++ b/sound/pci/cs46xx/dsp_spos.c
@@ -798,7 +798,7 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
 
         if ((entry = snd_info_create_card_entry(card, "dsp", card->proc_root)) != NULL) {
                 entry->content = SNDRV_INFO_CONTENT_TEXT;
-                entry->mode = S_IFDIR | S_IRUGO | S_IXUGO;
+                entry->mode = S_IFDIR | 0555;
       
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
@@ -814,7 +814,7 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
         if ((entry = snd_info_create_card_entry(card, "spos_symbols", ins->proc_dsp_dir)) != NULL) {
                 entry->content = SNDRV_INFO_CONTENT_TEXT;
                 entry->private_data = chip;
-                entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
+                entry->mode = S_IFREG | 0644;
                 entry->c.text.read = cs46xx_dsp_proc_symbol_table_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
@@ -826,7 +826,7 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
         if ((entry = snd_info_create_card_entry(card, "spos_modules", ins->proc_dsp_dir)) != NULL) {
                 entry->content = SNDRV_INFO_CONTENT_TEXT;
                 entry->private_data = chip;
-                entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
+                entry->mode = S_IFREG | 0644;
                 entry->c.text.read = cs46xx_dsp_proc_modules_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
@@ -838,7 +838,7 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
         if ((entry = snd_info_create_card_entry(card, "parameter", ins->proc_dsp_dir)) != NULL) {
                 entry->content = SNDRV_INFO_CONTENT_TEXT;
                 entry->private_data = chip;
-                entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
+                entry->mode = S_IFREG | 0644;
                 entry->c.text.read = cs46xx_dsp_proc_parameter_dump_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
@@ -850,7 +850,7 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
         if ((entry = snd_info_create_card_entry(card, "sample", ins->proc_dsp_dir)) != NULL) {
                 entry->content = SNDRV_INFO_CONTENT_TEXT;
                 entry->private_data = chip;
-                entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
+                entry->mode = S_IFREG | 0644;
                 entry->c.text.read = cs46xx_dsp_proc_sample_dump_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
@@ -862,7 +862,7 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
         if ((entry = snd_info_create_card_entry(card, "task_tree", ins->proc_dsp_dir)) != NULL) {
                 entry->content = SNDRV_INFO_CONTENT_TEXT;
                 entry->private_data = chip;
-                entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
+                entry->mode = S_IFREG | 0644;
                 entry->c.text.read = cs46xx_dsp_proc_task_tree_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
@@ -874,7 +874,7 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
         if ((entry = snd_info_create_card_entry(card, "scb_info", ins->proc_dsp_dir)) != NULL) {
                 entry->content = SNDRV_INFO_CONTENT_TEXT;
                 entry->private_data = chip;
-                entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
+                entry->mode = S_IFREG | 0644;
                 entry->c.text.read = cs46xx_dsp_proc_scb_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index 7488e1b7a770..abb01ce66983 100644
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
@@ -271,7 +271,7 @@ void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip,
       
                         entry->content = SNDRV_INFO_CONTENT_TEXT;
                         entry->private_data = scb_info;
-                        entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
+                        entry->mode = S_IFREG | 0644;
       
                         entry->c.text.read = cs46xx_dsp_proc_scb_info_read;