From: Takashi Sakamoto Date: Mon, 5 Aug 2024 08:53:52 +0000 (+0900) Subject: firewire: core: use guard macro to maintain static packet data for phy configuration X-Git-Tag: v6.12-rc1~95^2~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=232f72b10da74054055558b05235a725c3b90468;p=thirdparty%2Fkernel%2Flinux.git firewire: core: use guard macro to maintain static packet data for phy configuration The core function provide a kernel API to send phy configuration packet. Current implementation of the feature uses packet object allocated statically. The concurrent access to the object is protected by static mutex. This commit uses guard macro to maintain the mutex. Link: https://lore.kernel.org/r/20240805085408.251763-2-o-takashi@sakamocchi.jp Signed-off-by: Takashi Sakamoto --- diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c index a89c841a7dbe7..2a2cbd6e2f9be 100644 --- a/drivers/firewire/core-transaction.c +++ b/drivers/firewire/core-transaction.c @@ -494,7 +494,7 @@ void fw_send_phy_config(struct fw_card *card, phy_packet_phy_config_set_gap_count(&data, gap_count); phy_packet_phy_config_set_gap_count_optimization(&data, true); - mutex_lock(&phy_config_mutex); + guard(mutex)(&phy_config_mutex); async_header_set_tcode(phy_config_packet.header, TCODE_LINK_INTERNAL); phy_config_packet.header[1] = data; @@ -508,8 +508,6 @@ void fw_send_phy_config(struct fw_card *card, card->driver->send_request(card, &phy_config_packet); wait_for_completion_timeout(&phy_config_done, timeout); - - mutex_unlock(&phy_config_mutex); } static struct fw_address_handler *lookup_overlapping_address_handler(