Skip to content

Commit 7ec8ed3

Browse files
bardliaoujfalusi
authored andcommitted
Revert "soundwire: record Peripheral scale_index"
The commit doesn't add much value and will increase the maintain effort. This reverts commit 903cbf5. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
1 parent 4de7860 commit 7ec8ed3

3 files changed

Lines changed: 0 additions & 7 deletions

File tree

drivers/soundwire/bus.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,6 @@ static int sdw_slave_set_frequency(struct sdw_slave *slave)
14111411
dev_err(&slave->dev,
14121412
"SDW_SCP_BUSCLOCK_SCALE_B1 write failed:%d\n", ret);
14131413

1414-
slave->scale_index = scale_index;
14151414
return ret;
14161415
}
14171416

drivers/soundwire/stream.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -705,9 +705,6 @@ static int sdw_program_params(struct sdw_bus *bus, bool prepare)
705705
if (scale_index < 0)
706706
return scale_index;
707707

708-
if (scale_index == slave->scale_index)
709-
continue;
710-
711708
/* Skip the unattached Peripherals */
712709
if (!completion_done(&slave->enumeration_complete)) {
713710
dev_warn(&slave->dev,
@@ -720,7 +717,6 @@ static int sdw_program_params(struct sdw_bus *bus, bool prepare)
720717
dev_err(&slave->dev, "SDW_SCP_BUSCLOCK_SCALE register write failed\n");
721718
return ret;
722719
}
723-
slave->scale_index = scale_index;
724720
}
725721

726722
manager_runtime:

include/linux/soundwire/sdw.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,6 @@ struct sdw_slave_ops {
661661
* protocol for SoundWire mockup devices
662662
* @sdw_dev_lock: mutex used to protect callbacks/remove races
663663
* @sdca_data: structure containing all device data for SDCA helpers
664-
* @scale_index: current bus clock scaling index
665664
*/
666665
struct sdw_slave {
667666
struct sdw_slave_id id;
@@ -687,7 +686,6 @@ struct sdw_slave {
687686
bool is_mockup_device;
688687
struct mutex sdw_dev_lock; /* protect callbacks/remove races */
689688
struct sdca_device_data sdca_data;
690-
unsigned int scale_index;
691689
};
692690

693691
#define dev_to_sdw_dev(_dev) container_of(_dev, struct sdw_slave, dev)

0 commit comments

Comments
 (0)