firewire: core: use common helper function to serialize phy configuration packet

A common helper function is available to serialize the first quadlet of phy
configuration packet.

This commit is for the purpose.

Link: https://lore.kernel.org/r/20240729134631.127189-4-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 9a7dc90330a3514f29c9b053d581a9e38984bf62..619048dcfd72ee16a0c3b0da5edd4d1421514975 100644 (file)
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -37,6 +37,8 @@
 #include "core.h"
 #include <trace/events/firewire.h>
 
+#include "packet-header-definitions.h"
+
 /*
  * ABI version history is documented in linux/firewire-cdev.h.
  */
@@ -1635,7 +1637,7 @@ static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg)
        e->client               = client;
        e->p.speed              = SCODE_100;
        e->p.generation         = a->generation;
-       e->p.header[0]          = TCODE_LINK_INTERNAL << 4;
+       async_header_set_tcode(e->p.header, TCODE_LINK_INTERNAL);
        e->p.header[1]          = a->data[0];
        e->p.header[2]          = a->data[1];
        e->p.header_length      = 12;

diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index 4d2fc1f31fec90119c82727e4eb977c693f5e2c3..a89c841a7dbe7cf89778076c68658449a33aa14d 100644 (file)
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -464,7 +464,6 @@ static void transmit_phy_packet_callback(struct fw_packet *packet,
 
 static struct fw_packet phy_config_packet = {
        .header_length  = 12,
-       .header[0]      = TCODE_LINK_INTERNAL << 4,
        .payload_length = 0,
        .speed          = SCODE_100,
        .callback       = transmit_phy_packet_callback,
@@ -497,6 +496,7 @@ void fw_send_phy_config(struct fw_card *card,
 
        mutex_lock(&phy_config_mutex);
 
+       async_header_set_tcode(phy_config_packet.header, TCODE_LINK_INTERNAL);
        phy_config_packet.header[1] = data;
        phy_config_packet.header[2] = ~data;
        phy_config_packet.generation = generation;