Skip to content

Commit 1e28005

Browse files
Dr. David Alan Gilberttiwai
authored andcommitted
ALSA: firewire: Remove unused cmp_connection_update
cmp_connection_update() has been unused since 2019's commit 7eb7b18 ("ALSA: fireworks: code refactoring for bus reset handler") Remove it. Signed-off-by: Dr. David Alan Gilbert <[email protected]> Reviewed-by: Takashi Sakamoto <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 504f052 commit 1e28005

File tree

2 files changed

+0
-48
lines changed

2 files changed

+0
-48
lines changed

sound/firewire/cmp.c

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -333,53 +333,6 @@ int cmp_connection_establish(struct cmp_connection *c)
333333
}
334334
EXPORT_SYMBOL(cmp_connection_establish);
335335

336-
/**
337-
* cmp_connection_update - update the connection after a bus reset
338-
* @c: the connection manager
339-
*
340-
* This function must be called from the driver's .update handler to
341-
* reestablish any connection that might have been active.
342-
*
343-
* Returns zero on success, or a negative error code. On an error, the
344-
* connection is broken and the caller must stop transmitting iso packets.
345-
*/
346-
int cmp_connection_update(struct cmp_connection *c)
347-
{
348-
int err;
349-
350-
mutex_lock(&c->mutex);
351-
352-
if (!c->connected) {
353-
mutex_unlock(&c->mutex);
354-
return 0;
355-
}
356-
357-
err = fw_iso_resources_update(&c->resources);
358-
if (err < 0)
359-
goto err_unconnect;
360-
361-
if (c->direction == CMP_OUTPUT)
362-
err = pcr_modify(c, opcr_set_modify, pcr_set_check,
363-
SUCCEED_ON_BUS_RESET);
364-
else
365-
err = pcr_modify(c, ipcr_set_modify, pcr_set_check,
366-
SUCCEED_ON_BUS_RESET);
367-
368-
if (err < 0)
369-
goto err_unconnect;
370-
371-
mutex_unlock(&c->mutex);
372-
373-
return 0;
374-
375-
err_unconnect:
376-
c->connected = false;
377-
mutex_unlock(&c->mutex);
378-
379-
return err;
380-
}
381-
EXPORT_SYMBOL(cmp_connection_update);
382-
383336
static __be32 pcr_break_modify(struct cmp_connection *c, __be32 pcr)
384337
{
385338
return pcr & ~cpu_to_be32(PCR_BCAST_CONN | PCR_P2P_CONN_MASK);

sound/firewire/cmp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ int cmp_connection_reserve(struct cmp_connection *connection,
4747
void cmp_connection_release(struct cmp_connection *connection);
4848

4949
int cmp_connection_establish(struct cmp_connection *connection);
50-
int cmp_connection_update(struct cmp_connection *connection);
5150
void cmp_connection_break(struct cmp_connection *connection);
5251

5352
#endif

0 commit comments

Comments
 (0)