Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: thesofproject/linux
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9a34250aa844d7c60be101192a20a301cead1f6d
Choose a base ref
..
head repository: thesofproject/linux
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 999288ca48f44b824d80e80e2aacf677186254a6
Choose a head ref
Showing with 1 addition and 10 deletions.
  1. +1 −10 drivers/soundwire/stream.c
11 changes: 1 addition & 10 deletions drivers/soundwire/stream.c
Original file line number Diff line number Diff line change
@@ -1656,7 +1656,6 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream)
unsigned int multi_lane_bandwidth;
unsigned int bandwidth;
struct sdw_bus *bus;
int ch_mask;
int ret = 0;

list_for_each_entry(m_rt, &stream->master_list, stream_node) {
@@ -1672,18 +1671,10 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream)
multi_lane_bandwidth = 0;

list_for_each_entry(p_rt, &m_rt->port_list, port_node) {
ch_mask = p_rt->ch_mask;
/*
* p_rt->ch_mask will be used to calculate the required bandwidth.
* Clear here to aviod the p_rt bandwidth being calculated after
* deprepared.
*/
p_rt->ch_mask = 0;

if (!p_rt->lane)
continue;

bandwidth = m_rt->stream->params.rate * hweight32(ch_mask) *
bandwidth = m_rt->stream->params.rate * hweight32(p_rt->ch_mask) *
m_rt->stream->params.bps;
multi_lane_bandwidth += bandwidth;
bus->lane_used_bandwidth[p_rt->lane] -= bandwidth;