]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
firewire: core: rename member name for channel mask of isoc resource
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Wed, 20 May 2026 13:08:39 +0000 (22:08 +0900)
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>
Thu, 21 May 2026 09:43:25 +0000 (18:43 +0900)
The iso_resource_params structure has a member for channel mask, while
the name of field is easy to misinterpret.

Append _mask to the member name.

Link: https://lore.kernel.org/r/20260520130840.629934-3-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
drivers/firewire/core-cdev.c

index c669c9e42d34d2207f10833e8ec41344fd3b0a03..56c21cabc20cdfc2f27c0a878d8c2403fe71eff9 100644 (file)
@@ -129,7 +129,7 @@ struct descriptor_resource {
 };
 
 struct iso_resource_params {
-       u64 channels;
+       u64 channels_mask;
        s32 bandwidth;
 };
 
@@ -1316,7 +1316,7 @@ static int fill_iso_resource_params(struct iso_resource_params *params,
            request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
                return -EINVAL;
 
-       params->channels = request->channels;
+       params->channels_mask = request->channels;
        params->bandwidth = request->bandwidth;
 
        return 0;
@@ -1360,7 +1360,7 @@ static void iso_resource_auto_work(struct work_struct *work)
 
        bandwidth = r->params.bandwidth;
 
-       fw_iso_resource_manage(client->device->card, current_generation, r->params.channels,
+       fw_iso_resource_manage(client->device->card, current_generation, r->params.channels_mask,
                               &channel, &bandwidth, todo != ISO_RES_AUTO_DEALLOC);
 
        if (todo == ISO_RES_AUTO_DEALLOC) {
@@ -1402,7 +1402,7 @@ static void iso_resource_auto_work(struct work_struct *work)
                                r->todo = ISO_RES_AUTO_REALLOC;
 
                        if (channel >= 0)
-                               r->params.channels = 1ULL << channel;
+                               r->params.channels_mask = BIT_ULL(channel);
 
                        e = r->e_alloc;
                        r->e_alloc = NULL;
@@ -1496,7 +1496,7 @@ static void iso_resource_once_work(struct work_struct *work)
 
        bandwidth = r->params.bandwidth;
 
-       fw_iso_resource_manage(client->device->card, generation, r->params.channels, &channel,
+       fw_iso_resource_manage(client->device->card, generation, r->params.channels_mask, &channel,
                               &bandwidth, r->todo == ISO_RES_ONCE_ALLOC);
 
        e->iso_resource.handle = UNAVAILABLE_HANDLE;