ASoC: Merge v6.5-rc2

[platform/kernel/linux-rpi.git] / drivers / soundwire / generic_bandwidth_allocation.c

diff --git a/drivers/soundwire/generic_bandwidth_allocation.c b/drivers/soundwire/generic_bandwidth_allocation.c
index 325c475..31162f2 100644 (file)
--- a/drivers/soundwire/generic_bandwidth_allocation.c
+++ b/drivers/soundwire/generic_bandwidth_allocation.c
@@ -139,20 +139,16 @@ static void _sdw_compute_port_params(struct sdw_bus *bus,
 {
        struct sdw_master_runtime *m_rt;
        int hstop = bus->params.col - 1;
-       int block_offset, port_bo, i;
+       int port_bo, i;
 
        /* Run loop for all groups to compute transport parameters */
        for (i = 0; i < count; i++) {
                port_bo = 1;
-               block_offset = 1;
 
                list_for_each_entry(m_rt, &bus->m_rt_list, bus_node) {
-                       sdw_compute_master_ports(m_rt, &params[i],
-                                                port_bo, hstop);
+                       sdw_compute_master_ports(m_rt, &params[i], port_bo, hstop);
 
-                       block_offset += m_rt->ch_count *
-                                       m_rt->stream->params.bps;
-                       port_bo = block_offset;
+                       port_bo += m_rt->ch_count * m_rt->stream->params.bps;
                }
 
                hstop = hstop - params[i].hwidth;