Unverified Commit dfbbd3c0 authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

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: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20251203105542.24765-3-johan@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0c1db366

sound/soc/qcom/qdsp6/q6afe.c

+4 −6
Original line number Diff line number Diff line
@@ -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);

	scoped_guard(spinlock_irqsave, &afe->port_list_lock)

		list_del(&port->node);

	spin_unlock_irqrestore(&afe->port_list_lock, flags);

	kfree(port->scfg);

	kfree(port);

}
@@ -1807,7 +1805,7 @@ 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);

	scoped_guard(spinlock_irqsave, &afe->port_list_lock)

		list_add_tail(&port->node, &afe->port_list);



	return port;