Skip to content

Commit 6347038

Browse files
committed
Revert "soundwire: add sdw_slave_wait_for_initialization helper"
This reverts commit e7706a4. We should ensure the device is fully operational when it is resumed. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
1 parent 4eb2b60 commit 6347038

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

drivers/soundwire/slave.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -104,23 +104,6 @@ int sdw_slave_add(struct sdw_bus *bus,
104104
}
105105
EXPORT_SYMBOL(sdw_slave_add);
106106

107-
int sdw_slave_wait_for_initialization(struct sdw_slave *slave, unsigned int timeout)
108-
{
109-
unsigned long time;
110-
111-
time = wait_for_completion_timeout(&slave->initialization_complete,
112-
msecs_to_jiffies(timeout));
113-
if (!time) {
114-
dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__);
115-
sdw_show_ping_status(slave->bus, true);
116-
117-
return -ETIMEDOUT;
118-
}
119-
120-
return 0;
121-
}
122-
EXPORT_SYMBOL(sdw_slave_wait_for_initialization);
123-
124107
#if IS_ENABLED(CONFIG_ACPI)
125108

126109
static bool find_slave(struct sdw_bus *bus,

include/linux/soundwire/sdw.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,6 @@ int sdw_stream_remove_slave(struct sdw_slave *slave,
10871087
struct sdw_stream_runtime *stream);
10881088

10891089
int sdw_slave_get_scale_index(struct sdw_slave *slave, u8 *base);
1090-
int sdw_slave_wait_for_initialization(struct sdw_slave *slave, unsigned int timeout);
10911090

10921091
/* messaging and data APIs */
10931092
int sdw_read(struct sdw_slave *slave, u32 addr);

0 commit comments

Comments
 (0)