ASoc: qcom: q6afe: use guards consistently

A recent change switched to using guards for the port list lock but only
modified two out of three functions where the lock is held.

Convert also the third function for consistency while switching to a
scoped guard in q6afe_port_get_from_id() for clarity.

Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20251203105542.24765-3-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Johan Hovold 2025-12-03 11:55:42 +01:00 committed by Mark Brown
parent 0c1db36664
commit dfbbd3c04f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0

View File

@ -931,13 +931,11 @@ static void q6afe_port_free(struct kref *ref)
{
struct q6afe_port *port;
struct q6afe *afe;
unsigned long flags;
port = container_of(ref, struct q6afe_port, refcount);
afe = port->afe;
spin_lock_irqsave(&afe->port_list_lock, flags);
list_del(&port->node);
spin_unlock_irqrestore(&afe->port_list_lock, flags);
scoped_guard(spinlock_irqsave, &afe->port_list_lock)
list_del(&port->node);
kfree(port->scfg);
kfree(port);
}
@ -1807,8 +1805,8 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id)
port->cfg_type = cfg_type;
kref_init(&port->refcount);
guard(spinlock_irqsave)(&afe->port_list_lock);
list_add_tail(&port->node, &afe->port_list);
scoped_guard(spinlock_irqsave, &afe->port_list_lock)
list_add_tail(&port->node, &afe->port_list);
return port;