diff options
author | Dr. David Alan Gilbert <linux@treblig.org> | 2024-10-09 01:36:53 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2024-10-10 14:22:01 +0200 |
commit | 1e280053dd4d8fb63eba7cff23105d76cc338f7d (patch) | |
tree | 527a75e4db5bcb357321ea2d0e20139a04d761fb | |
parent | 504f052aa3435ab2f15af8b20bc4f4de8ff259c7 (diff) | |
download | lwn-1e280053dd4d8fb63eba7cff23105d76cc338f7d.tar.gz lwn-1e280053dd4d8fb63eba7cff23105d76cc338f7d.zip |
ALSA: firewire: Remove unused cmp_connection_update
cmp_connection_update() has been unused since 2019's commit
7eb7b18e9fc7 ("ALSA: fireworks: code refactoring for bus reset handler")
Remove it.
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20241009003653.254753-1-linux@treblig.org
-rw-r--r-- | sound/firewire/cmp.c | 47 | ||||
-rw-r--r-- | sound/firewire/cmp.h | 1 |
2 files changed, 0 insertions, 48 deletions
diff --git a/sound/firewire/cmp.c b/sound/firewire/cmp.c index b596bec19774..f5028a061a91 100644 --- a/sound/firewire/cmp.c +++ b/sound/firewire/cmp.c @@ -333,53 +333,6 @@ retry_after_bus_reset: } EXPORT_SYMBOL(cmp_connection_establish); -/** - * cmp_connection_update - update the connection after a bus reset - * @c: the connection manager - * - * This function must be called from the driver's .update handler to - * reestablish any connection that might have been active. - * - * Returns zero on success, or a negative error code. On an error, the - * connection is broken and the caller must stop transmitting iso packets. - */ -int cmp_connection_update(struct cmp_connection *c) -{ - int err; - - mutex_lock(&c->mutex); - - if (!c->connected) { - mutex_unlock(&c->mutex); - return 0; - } - - err = fw_iso_resources_update(&c->resources); - if (err < 0) - goto err_unconnect; - - if (c->direction == CMP_OUTPUT) - err = pcr_modify(c, opcr_set_modify, pcr_set_check, - SUCCEED_ON_BUS_RESET); - else - err = pcr_modify(c, ipcr_set_modify, pcr_set_check, - SUCCEED_ON_BUS_RESET); - - if (err < 0) - goto err_unconnect; - - mutex_unlock(&c->mutex); - - return 0; - -err_unconnect: - c->connected = false; - mutex_unlock(&c->mutex); - - return err; -} -EXPORT_SYMBOL(cmp_connection_update); - static __be32 pcr_break_modify(struct cmp_connection *c, __be32 pcr) { return pcr & ~cpu_to_be32(PCR_BCAST_CONN | PCR_P2P_CONN_MASK); diff --git a/sound/firewire/cmp.h b/sound/firewire/cmp.h index 26ab88000e34..66fc08b742d2 100644 --- a/sound/firewire/cmp.h +++ b/sound/firewire/cmp.h @@ -47,7 +47,6 @@ int cmp_connection_reserve(struct cmp_connection *connection, void cmp_connection_release(struct cmp_connection *connection); int cmp_connection_establish(struct cmp_connection *connection); -int cmp_connection_update(struct cmp_connection *connection); void cmp_connection_break(struct cmp_connection *connection); #endif |