summaryrefslogtreecommitdiff
path: root/drivers/firewire/core-cdev.c
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2026-05-20 22:08:39 +0900
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>2026-05-21 18:43:25 +0900
commit9e38ee1c5522b1b6ba62e0766202bcc9979d6ae3 (patch)
tree2c086290380abb5ef20121c3aee5d21070002900 /drivers/firewire/core-cdev.c
parent7cc812e634bdea9958606eaa9d5ba3e5ec52e6b7 (diff)
downloadlinux-next-9e38ee1c5522b1b6ba62e0766202bcc9979d6ae3.tar.gz
linux-next-9e38ee1c5522b1b6ba62e0766202bcc9979d6ae3.zip
firewire: core: rename member name for channel mask of isoc resource
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>
Diffstat (limited to 'drivers/firewire/core-cdev.c')
-rw-r--r--drivers/firewire/core-cdev.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index c669c9e42d34..56c21cabc20c 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -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;