summaryrefslogtreecommitdiffstats
path: root/kernel/sound/pci/ctxfi
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/pci/ctxfi')
-rw-r--r--kernel/sound/pci/ctxfi/ctamixer.c6
-rw-r--r--kernel/sound/pci/ctxfi/ctamixer.h2
-rw-r--r--kernel/sound/pci/ctxfi/ctdaio.c10
-rw-r--r--kernel/sound/pci/ctxfi/ctdaio.h4
-rw-r--r--kernel/sound/pci/ctxfi/cthw20k1.c4
-rw-r--r--kernel/sound/pci/ctxfi/cthw20k2.c4
-rw-r--r--kernel/sound/pci/ctxfi/ctresource.c2
-rw-r--r--kernel/sound/pci/ctxfi/ctresource.h2
-rw-r--r--kernel/sound/pci/ctxfi/ctsrc.c6
-rw-r--r--kernel/sound/pci/ctxfi/ctsrc.h4
10 files changed, 22 insertions, 22 deletions
diff --git a/kernel/sound/pci/ctxfi/ctamixer.c b/kernel/sound/pci/ctxfi/ctamixer.c
index c7dc38d41..5fcbb065d 100644
--- a/kernel/sound/pci/ctxfi/ctamixer.c
+++ b/kernel/sound/pci/ctxfi/ctamixer.c
@@ -49,7 +49,7 @@ static int amixer_output_slot(const struct rsc *rsc)
return (amixer_index(rsc) << 4) + 0x4;
}
-static struct rsc_ops amixer_basic_rsc_ops = {
+static const struct rsc_ops amixer_basic_rsc_ops = {
.master = amixer_master,
.next_conj = amixer_next_conj,
.index = amixer_index,
@@ -186,7 +186,7 @@ static int amixer_setup(struct amixer *amixer, struct rsc *input,
return 0;
}
-static struct amixer_rsc_ops amixer_ops = {
+static const struct amixer_rsc_ops amixer_ops = {
.set_input = amixer_set_input,
.set_invalid_squash = amixer_set_invalid_squash,
.set_scale = amixer_set_y,
@@ -357,7 +357,7 @@ static int sum_output_slot(const struct rsc *rsc)
return (sum_index(rsc) << 4) + 0xc;
}
-static struct rsc_ops sum_basic_rsc_ops = {
+static const struct rsc_ops sum_basic_rsc_ops = {
.master = sum_master,
.next_conj = sum_next_conj,
.index = sum_index,
diff --git a/kernel/sound/pci/ctxfi/ctamixer.h b/kernel/sound/pci/ctxfi/ctamixer.h
index 72f42f274..2de18aa65 100644
--- a/kernel/sound/pci/ctxfi/ctamixer.h
+++ b/kernel/sound/pci/ctxfi/ctamixer.h
@@ -58,7 +58,7 @@ struct amixer {
unsigned char idx[8];
struct rsc *input; /* pointer to a resource acting as source */
struct sum *sum; /* Put amixer output to this summation node */
- struct amixer_rsc_ops *ops; /* AMixer specific operations */
+ const struct amixer_rsc_ops *ops; /* AMixer specific operations */
};
struct amixer_rsc_ops {
diff --git a/kernel/sound/pci/ctxfi/ctdaio.c b/kernel/sound/pci/ctxfi/ctdaio.c
index 9b87dd28d..7f089cb43 100644
--- a/kernel/sound/pci/ctxfi/ctdaio.c
+++ b/kernel/sound/pci/ctxfi/ctdaio.c
@@ -83,21 +83,21 @@ static int daio_in_next_conj_20k2(struct rsc *rsc)
return rsc->conj += 0x100;
}
-static struct rsc_ops daio_out_rsc_ops = {
+static const struct rsc_ops daio_out_rsc_ops = {
.master = daio_master,
.next_conj = daio_out_next_conj,
.index = daio_index,
.output_slot = NULL,
};
-static struct rsc_ops daio_in_rsc_ops_20k1 = {
+static const struct rsc_ops daio_in_rsc_ops_20k1 = {
.master = daio_master,
.next_conj = daio_in_next_conj_20k1,
.index = NULL,
.output_slot = daio_index,
};
-static struct rsc_ops daio_in_rsc_ops_20k2 = {
+static const struct rsc_ops daio_in_rsc_ops_20k2 = {
.master = daio_master,
.next_conj = daio_in_next_conj_20k2,
.index = NULL,
@@ -263,7 +263,7 @@ static int dao_clear_right_input(struct dao *dao)
return 0;
}
-static struct dao_rsc_ops dao_ops = {
+static const struct dao_rsc_ops dao_ops = {
.set_spos = dao_spdif_set_spos,
.commit_write = dao_commit_write,
.get_spos = dao_spdif_get_spos,
@@ -318,7 +318,7 @@ static int dai_commit_write(struct dai *dai)
return 0;
}
-static struct dai_rsc_ops dai_ops = {
+static const struct dai_rsc_ops dai_ops = {
.set_srt_srcl = dai_set_srt_srcl,
.set_srt_srcr = dai_set_srt_srcr,
.set_srt_msr = dai_set_srt_msr,
diff --git a/kernel/sound/pci/ctxfi/ctdaio.h b/kernel/sound/pci/ctxfi/ctdaio.h
index 0ebbf350f..a30be73b0 100644
--- a/kernel/sound/pci/ctxfi/ctdaio.h
+++ b/kernel/sound/pci/ctxfi/ctdaio.h
@@ -51,7 +51,7 @@ struct daio {
struct dao {
struct daio daio;
- struct dao_rsc_ops *ops; /* DAO specific operations */
+ const struct dao_rsc_ops *ops; /* DAO specific operations */
struct imapper **imappers;
struct daio_mgr *mgr;
struct hw *hw;
@@ -60,7 +60,7 @@ struct dao {
struct dai {
struct daio daio;
- struct dai_rsc_ops *ops; /* DAI specific operations */
+ const struct dai_rsc_ops *ops; /* DAI specific operations */
struct hw *hw;
void *ctrl_blk;
};
diff --git a/kernel/sound/pci/ctxfi/cthw20k1.c b/kernel/sound/pci/ctxfi/cthw20k1.c
index 1cac55fd1..9667cbfb0 100644
--- a/kernel/sound/pci/ctxfi/cthw20k1.c
+++ b/kernel/sound/pci/ctxfi/cthw20k1.c
@@ -1910,8 +1910,8 @@ static int hw_card_start(struct hw *hw)
return err;
/* Set DMA transfer mask */
- if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||
- pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {
+ if (dma_set_mask(&pci->dev, CT_XFI_DMA_MASK) < 0 ||
+ dma_set_coherent_mask(&pci->dev, CT_XFI_DMA_MASK) < 0) {
dev_err(hw->card->dev,
"architecture does not support PCI busmaster DMA with mask 0x%llx\n",
CT_XFI_DMA_MASK);
diff --git a/kernel/sound/pci/ctxfi/cthw20k2.c b/kernel/sound/pci/ctxfi/cthw20k2.c
index 955ad871e..9dc2950e1 100644
--- a/kernel/sound/pci/ctxfi/cthw20k2.c
+++ b/kernel/sound/pci/ctxfi/cthw20k2.c
@@ -2035,8 +2035,8 @@ static int hw_card_start(struct hw *hw)
return err;
/* Set DMA transfer mask */
- if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||
- pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {
+ if (dma_set_mask(&pci->dev, CT_XFI_DMA_MASK) < 0 ||
+ dma_set_coherent_mask(&pci->dev, CT_XFI_DMA_MASK) < 0) {
dev_err(hw->card->dev,
"architecture does not support PCI busmaster DMA with mask 0x%llx\n",
CT_XFI_DMA_MASK);
diff --git a/kernel/sound/pci/ctxfi/ctresource.c b/kernel/sound/pci/ctxfi/ctresource.c
index 1a97e406d..c5124c3c0 100644
--- a/kernel/sound/pci/ctxfi/ctresource.c
+++ b/kernel/sound/pci/ctxfi/ctresource.c
@@ -127,7 +127,7 @@ static int rsc_master(struct rsc *rsc)
return rsc->conj = rsc->idx;
}
-static struct rsc_ops rsc_generic_ops = {
+static const struct rsc_ops rsc_generic_ops = {
.index = rsc_index,
.output_slot = audio_ring_slot,
.master = rsc_master,
diff --git a/kernel/sound/pci/ctxfi/ctresource.h b/kernel/sound/pci/ctxfi/ctresource.h
index 9b746c371..736d9f7e9 100644
--- a/kernel/sound/pci/ctxfi/ctresource.h
+++ b/kernel/sound/pci/ctxfi/ctresource.h
@@ -39,7 +39,7 @@ struct rsc {
u32 msr:4; /* The Master Sample Rate a resource working on */
void *ctrl_blk; /* Chip specific control info block for a resource */
struct hw *hw; /* Chip specific object for hardware access means */
- struct rsc_ops *ops; /* Generic resource operations */
+ const struct rsc_ops *ops; /* Generic resource operations */
};
struct rsc_ops {
diff --git a/kernel/sound/pci/ctxfi/ctsrc.c b/kernel/sound/pci/ctxfi/ctsrc.c
index ec1f08464..a5a72df29 100644
--- a/kernel/sound/pci/ctxfi/ctsrc.c
+++ b/kernel/sound/pci/ctxfi/ctsrc.c
@@ -335,7 +335,7 @@ static int src_default_config_arcrw(struct src *src)
return 0;
}
-static struct src_rsc_ops src_rsc_ops = {
+static const struct src_rsc_ops src_rsc_ops = {
.set_state = src_set_state,
.set_bm = src_set_bm,
.set_sf = src_set_sf,
@@ -611,7 +611,7 @@ static int srcimp_index(const struct rsc *rsc)
return container_of(rsc, struct srcimp, rsc)->idx[rsc->conj];
}
-static struct rsc_ops srcimp_basic_rsc_ops = {
+static const struct rsc_ops srcimp_basic_rsc_ops = {
.master = srcimp_master,
.next_conj = srcimp_next_conj,
.index = srcimp_index,
@@ -662,7 +662,7 @@ static int srcimp_unmap(struct srcimp *srcimp)
return 0;
}
-static struct srcimp_rsc_ops srcimp_ops = {
+static const struct srcimp_rsc_ops srcimp_ops = {
.map = srcimp_map,
.unmap = srcimp_unmap
};
diff --git a/kernel/sound/pci/ctxfi/ctsrc.h b/kernel/sound/pci/ctxfi/ctsrc.h
index da7573c5d..92944a012 100644
--- a/kernel/sound/pci/ctxfi/ctsrc.h
+++ b/kernel/sound/pci/ctxfi/ctsrc.h
@@ -48,7 +48,7 @@ struct src_rsc_ops;
struct src {
struct rsc rsc; /* Basic resource info */
struct src *intlv; /* Pointer to next interleaved SRC in a series */
- struct src_rsc_ops *ops; /* SRC specific operations */
+ const struct src_rsc_ops *ops; /* SRC specific operations */
/* Number of contiguous srcs for interleaved usage */
unsigned char multi;
unsigned char mode; /* Working mode of this SRC resource */
@@ -110,7 +110,7 @@ struct srcimp {
struct imapper *imappers;
unsigned int mapped; /* A bit-map indicating which conj rsc is mapped */
struct srcimp_mgr *mgr;
- struct srcimp_rsc_ops *ops;
+ const struct srcimp_rsc_ops *ops;
};
struct srcimp_rsc_ops {