summaryrefslogtreecommitdiffstats
path: root/kernel/sound/pci/ca0106
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/pci/ca0106')
-rw-r--r--kernel/sound/pci/ca0106/Makefile3
-rw-r--r--kernel/sound/pci/ca0106/ca0106_main.c6
-rw-r--r--kernel/sound/pci/ca0106/ca0106_proc.c4
3 files changed, 5 insertions, 8 deletions
diff --git a/kernel/sound/pci/ca0106/Makefile b/kernel/sound/pci/ca0106/Makefile
index dcbae7b31..c1455fc55 100644
--- a/kernel/sound/pci/ca0106/Makefile
+++ b/kernel/sound/pci/ca0106/Makefile
@@ -1,3 +1,4 @@
-snd-ca0106-objs := ca0106_main.o ca0106_proc.o ca0106_mixer.o ca_midi.o
+snd-ca0106-objs := ca0106_main.o ca0106_mixer.o ca_midi.o
+snd-ca0106-$(CONFIG_SND_PROC_FS) += ca0106_proc.o
obj-$(CONFIG_SND_CA0106) += snd-ca0106.o
diff --git a/kernel/sound/pci/ca0106/ca0106_main.c b/kernel/sound/pci/ca0106/ca0106_main.c
index dd75b7536..d3cd95633 100644
--- a/kernel/sound/pci/ca0106/ca0106_main.c
+++ b/kernel/sound/pci/ca0106/ca0106_main.c
@@ -1676,8 +1676,8 @@ static int snd_ca0106_create(int dev, struct snd_card *card,
err = pci_enable_device(pci);
if (err < 0)
return err;
- if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
- pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
+ if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0 ||
+ dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
dev_err(card->dev, "error to set 32bit mask DMA\n");
pci_disable_device(pci);
return -ENXIO;
@@ -1885,7 +1885,7 @@ static int snd_ca0106_probe(struct pci_dev *pci,
goto error;
dev_dbg(card->dev, " done.\n");
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_SND_PROC_FS
snd_ca0106_proc_init(chip);
#endif
diff --git a/kernel/sound/pci/ca0106/ca0106_proc.c b/kernel/sound/pci/ca0106/ca0106_proc.c
index 2c5c28adb..9b2b8b381 100644
--- a/kernel/sound/pci/ca0106/ca0106_proc.c
+++ b/kernel/sound/pci/ca0106/ca0106_proc.c
@@ -75,8 +75,6 @@
#include "ca0106.h"
-#ifdef CONFIG_PROC_FS
-
struct snd_ca0106_category_str {
int val;
const char *name;
@@ -453,5 +451,3 @@ int snd_ca0106_proc_init(struct snd_ca0106 *emu)
snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read2);
return 0;
}
-
-#endif /* CONFIG_PROC_FS */