diff options
| author |   Vinod Koul <vkoul@kernel.org> | 2021-12-17 21:42:17 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2021-12-17 21:42:17 +0530 |
| commit | 2577394f4b01906d345d8b223d1a17cc34e46b46 (patch) | |
| tree | 932ef63ff765723e09b18d56d09d40220a5221e3 /include/linux/dmaengine.h | |
| parent | dmaengine: sh: Use bitmap_zalloc() when applicable (diff) | |
| parent | dmaengine: remove slave_id config field (diff) | |
| download | wireguard-linux-2577394f4b01906d345d8b223d1a17cc34e46b46.tar.xz wireguard-linux-2577394f4b01906d345d8b223d1a17cc34e46b46.zip | |
Merge tag 'dmaengine_topic_slave_id_removal_5.17' into next
Merge the tag dmaengine_topic_slave_id_removal_5.17 into next. This
brings in the slave_id removal topic changes
Diffstat (limited to 'include/linux/dmaengine.h')
| -rw-r--r-- | include/linux/dmaengine.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 554a86665de9..842d4f7ca752 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -419,9 +419,6 @@ enum dma_slave_buswidth { * @device_fc: Flow Controller Settings. Only valid for slave channels. Fill * with 'true' if peripheral should be flow controller. Direction will be * selected at Runtime. - * @slave_id: Slave requester id. Only valid for slave channels. The dma - * slave peripheral will have unique id as dma requester which need to be - * pass as slave config. * @peripheral_config: peripheral configuration for programming peripheral * for dmaengine transfer * @peripheral_size: peripheral configuration buffer size @@ -449,7 +446,6 @@ struct dma_slave_config { u32 src_port_window_size; u32 dst_port_window_size; bool device_fc; - unsigned int slave_id; void *peripheral_config; size_t peripheral_size; }; |