MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-05 13:25:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

firewire: core: use guard macro to maintain list of receivers for phy configuration packets

Browse Source 
The core function maintains clients to receive phy configuration packets
by list in the instance of fw_card. The concurrent access to the list is
protected by spinlock in the instance.

This commit uses guard macro to maintain the list.

Link: https://lore.kernel.org/r/20240805085408.251763-13-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
This commit is contained in:
Takashi Sakamoto 2024-08-05 17:54:03 +09:00
parent cf123b0128
commit b9545448f0
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/firewire/core-cdev.c
View File

@ -1659,26 +1659,22 @@ static int ioctl_receive_phy_packets(struct client *client, union ioctl_arg *arg
if (!client->device->is_local) if (!client->device->is_local)
return -ENOSYS; return -ENOSYS;
spin_lock_irq(&card->lock); guard(spinlock_irq)(&card->lock);
list_move_tail(&client->phy_receiver_link, &card->phy_receiver_list); list_move_tail(&client->phy_receiver_link, &card->phy_receiver_list);
client->phy_receiver_closure = a->closure; client->phy_receiver_closure = a->closure;
spin_unlock_irq(&card->lock);
return 0; return 0;
} }
void fw_cdev_handle_phy_packet(struct fw_card *card, struct fw_packet *p) void fw_cdev_handle_phy_packet(struct fw_card *card, struct fw_packet *p)
{ {
struct client *client; struct client *client;
struct inbound_phy_packet_event *e;
unsigned long flags;
spin_lock_irqsave(&card->lock, flags); guard(spinlock_irqsave)(&card->lock);
list_for_each_entry(client, &card->phy_receiver_list, phy_receiver_link) { list_for_each_entry(client, &card->phy_receiver_list, phy_receiver_link) {
e = kmalloc(sizeof(*e) + 8, GFP_ATOMIC); struct inbound_phy_packet_event *e = kmalloc(sizeof(*e) + 8, GFP_ATOMIC);
if (e == NULL) if (e == NULL)
break; break;
@ -1706,8 +1702,6 @@ void fw_cdev_handle_phy_packet(struct fw_card *card, struct fw_packet *p)
queue_event(client, &e->event, &e->phy_packet, sizeof(*pp) + 8, NULL, 0); queue_event(client, &e->event, &e->phy_packet, sizeof(*pp) + 8, NULL, 0);
} }
} }
spin_unlock_irqrestore(&card->lock, flags);
} }
static int (* const ioctl_handlers[])(struct client *, union ioctl_arg *) = { static int (* const ioctl_handlers[])(struct client *, union ioctl_arg *) = {
@ -1855,9 +1849,8 @@ static int fw_device_op_release(struct inode *inode, struct file *file)
struct client *client = file->private_data; struct client *client = file->private_data;
struct event *event, *next_event; struct event *event, *next_event;
spin_lock_irq(&client->device->card->lock); scoped_guard(spinlock_irq, &client->device->card->lock)
list_del(&client->phy_receiver_link); list_del(&client->phy_receiver_link);
spin_unlock_irq(&client->device->card->lock);
scoped_guard(mutex, &client->device->client_list_mutex) scoped_guard(mutex, &client->device->client_list_mutex)
list_del(&client->link); list_del(&client->link);