diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-13 15:07:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-13 15:07:27 +0100 |
| commit | 8ef28aef33f2d5da6959ad6b579ec3cfccc009f6 (patch) | |
| tree | 8d6faa62ae92cde16a8710b31e1f2a6bf570201a /include/linux | |
| parent | 14ffc3fe7f51793eb3004a5018292649729f5d95 (diff) | |
| parent | e7860dc5d8d45f6a0e98bfe542c7b776c5ede2a4 (diff) | |
Merge asoc/for-7.4 into asoc-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dmaengine.h | 9 | ||||
| -rw-r--r-- | include/linux/firmware/cirrus/cs_dsp.h | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index fe33a20abc61..f322e501ff62 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -1760,15 +1760,6 @@ void dma_run_dependencies(struct dma_async_tx_descriptor *tx); #define dma_request_channel(mask, x, y) \ __dma_request_channel(&(mask), x, y, NULL) -/* Deprecated, please use dma_request_chan() directly */ -static inline struct dma_chan * __deprecated -dma_request_slave_channel(struct device *dev, const char *name) -{ - struct dma_chan *ch = dma_request_chan(dev, name); - - return IS_ERR(ch) ? NULL : ch; -} - static inline struct dma_chan *dma_request_slave_channel_compat(const dma_cap_mask_t mask, dma_filter_fn fn, void *fn_param, diff --git a/include/linux/firmware/cirrus/cs_dsp.h b/include/linux/firmware/cirrus/cs_dsp.h index 4e3baa557068..6aa1e1b2b4a5 100644 --- a/include/linux/firmware/cirrus/cs_dsp.h +++ b/include/linux/firmware/cirrus/cs_dsp.h @@ -96,7 +96,7 @@ struct cs_dsp_alg_region { struct cs_dsp_coeff_ctl { struct list_head list; struct cs_dsp *dsp; - void *cache; + void *cache __counted_by_ptr(len); const char *fw_name; /* Subname is needed to match with firmware */ const char *subname; |
