diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index fabfe13533d436..0490777fa40671 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -1411,7 +1411,6 @@ static int sdw_slave_set_frequency(struct sdw_slave *slave) dev_err(&slave->dev, "SDW_SCP_BUSCLOCK_SCALE_B1 write failed:%d\n", ret); - slave->scale_index = scale_index; return ret; } diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index b8d10ec788e553..c2a6709dcb1196 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -705,9 +705,6 @@ static int sdw_program_params(struct sdw_bus *bus, bool prepare) if (scale_index < 0) return scale_index; - if (scale_index == slave->scale_index) - continue; - /* Skip the unattached Peripherals */ if (!completion_done(&slave->enumeration_complete)) { dev_warn(&slave->dev, @@ -720,7 +717,6 @@ static int sdw_program_params(struct sdw_bus *bus, bool prepare) dev_err(&slave->dev, "SDW_SCP_BUSCLOCK_SCALE register write failed\n"); return ret; } - slave->scale_index = scale_index; } manager_runtime: diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h index 0845182f75f9ab..6147eb1fb210d6 100644 --- a/include/linux/soundwire/sdw.h +++ b/include/linux/soundwire/sdw.h @@ -661,7 +661,6 @@ struct sdw_slave_ops { * protocol for SoundWire mockup devices * @sdw_dev_lock: mutex used to protect callbacks/remove races * @sdca_data: structure containing all device data for SDCA helpers - * @scale_index: current bus clock scaling index */ struct sdw_slave { struct sdw_slave_id id; @@ -687,7 +686,6 @@ struct sdw_slave { bool is_mockup_device; struct mutex sdw_dev_lock; /* protect callbacks/remove races */ struct sdca_device_data sdca_data; - unsigned int scale_index; }; #define dev_to_sdw_dev(_dev) container_of(_dev, struct sdw_slave, dev)