github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

firewire: cdev: refactor add_client_resource() to drop GFP flags argument

Browse Source 
The add_client_resource() function has an argument for GFP flags. The
argument was originally used to distinguish atomic calls. However, all
callers now use GFP_KERNEL.

Drop the unused argument and always allocate with GFP_KERNEL.

Link: https://lore.kernel.org/r/20260920083659.191855-5-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
This commit is contained in:
Takashi Sakamoto 2026-09-20 17:36:58 +09:00
parent 0958dcb1e5
commit 4e3f598122
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -547,8 +547,7 @@ static int ioctl_get_info(struct client *client, union ioctl_arg *arg)
return 0;
}
static int add_client_resource(struct client *client, struct client_resource *resource,
gfp_t gfp_mask)
static int add_client_resource(struct client *client, struct client_resource *resource)
{
scoped_guard(spinlock_irqsave, &client->lock) {
u32 index;
@ -557,13 +556,7 @@ static int add_client_resource(struct client *client, struct client_resource *re
if (client->in_shutdown)
return -ECANCELED;
if (gfpflags_allow_blocking(gfp_mask)) {
ret = xa_alloc(&client->resource_xa, &index, resource, xa_limit_32b,
GFP_NOWAIT);
} else {
ret = xa_alloc_bh(&client->resource_xa, &index, resource,
xa_limit_32b, GFP_NOWAIT);
}
ret = xa_alloc(&client->resource_xa, &index, resource, xa_limit_32b, GFP_KERNEL);
if (ret < 0)
return ret;
@ -713,7 +706,7 @@ static int init_request(struct client *client,
}
e->r.resource.release = release_transaction;
ret = add_client_resource(client, &e->r.resource, GFP_KERNEL);
ret = add_client_resource(client, &e->r.resource);
if (ret < 0)
goto failed;
@ -797,7 +790,7 @@ static void handle_request(struct fw_card *card, struct fw_request *request,
r->length = length;
r->resource.release = release_request;
ret = add_client_resource(handler->client, &r->resource, GFP_KERNEL);
ret = add_client_resource(handler->client, &r->resource);
if (ret < 0)
goto failed;
@ -901,7 +894,7 @@ static int ioctl_allocate(struct client *client, union ioctl_arg *arg)
a->offset = r->handler.offset;
r->resource.release = release_address_handler;
ret = add_client_resource(client, &r->resource, GFP_KERNEL);
ret = add_client_resource(client, &r->resource);
if (ret < 0) {
release_address_handler(client, &r->resource);
return ret;
@ -1001,7 +994,7 @@ static int ioctl_add_descriptor(struct client *client, union ioctl_arg *arg)
goto failed;
r->resource.release = release_descriptor;
ret = add_client_resource(client, &r->resource, GFP_KERNEL);
ret = add_client_resource(client, &r->resource);
if (ret < 0) {
fw_core_remove_descriptor(&r->descriptor);
goto failed;
@ -1489,7 +1482,7 @@ static int ioctl_allocate_iso_resource(struct client *client, union ioctl_arg *a
e2->iso_resource.type = FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED;
r->resource.release = release_iso_resource_auto;
err = add_client_resource(client, &r->resource, GFP_KERNEL);
err = add_client_resource(client, &r->resource);
if (err < 0)
return err;
request->handle = r->resource.handle;