mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 04:21:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

hsi: hsi_core: use kzalloc_flex

Browse Source 
Simplifies allocations by using a flexible array member in this struct.

Add __counted_by to get extra runtime analysis.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20260318191037.5661-1-rosenp@gmail.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Rosen Penev
2026-03-18 12:10:37 -07:00
committed by Sebastian Reichel
parent 6de23f81a5
commit e61af3ca89
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/hsi/hsi_core.c
View File

@@ -342,7 +342,6 @@ static void hsi_controller_release(struct device *dev)
{
struct hsi_controller *hsi = to_hsi_controller(dev);
kfree(hsi->port);
kfree(hsi);
}
@@ -446,7 +445,7 @@ void hsi_put_controller(struct hsi_controller *hsi)
return;
for (i = 0; i < hsi->num_ports; i++)
if (hsi->port && hsi->port[i])
if (hsi->port[i])
put_device(&hsi->port[i]->device);
put_device(&hsi->device);
}
@@ -462,39 +461,33 @@ EXPORT_SYMBOL_GPL(hsi_put_controller);
struct hsi_controller *hsi_alloc_controller(unsigned int n_ports, gfp_t flags)
{
struct hsi_controller *hsi;
struct hsi_port **port;
unsigned int i;
if (!n_ports)
return NULL;
hsi = kzalloc_obj(*hsi, flags);
hsi = kzalloc_flex(*hsi, port, n_ports, flags);
if (!hsi)
return NULL;
port = kzalloc_objs(*port, n_ports, flags);
if (!port) {
kfree(hsi);
return NULL;
}
hsi->num_ports = n_ports;
hsi->port = port;
hsi->device.release = hsi_controller_release;
device_initialize(&hsi->device);
for (i = 0; i < n_ports; i++) {
port[i] = kzalloc_obj(**port, flags);
if (port[i] == NULL)
hsi->port[i] = kzalloc_obj(**hsi->port, flags);
if (hsi->port[i] == NULL)
goto out;
port[i]->num = i;
port[i]->async = hsi_dummy_msg;
port[i]->setup = hsi_dummy_cl;
port[i]->flush = hsi_dummy_cl;
port[i]->start_tx = hsi_dummy_cl;
port[i]->stop_tx = hsi_dummy_cl;
port[i]->release = hsi_dummy_cl;
mutex_init(&port[i]->lock);
BLOCKING_INIT_NOTIFIER_HEAD(&port[i]->n_head);
dev_set_name(&port[i]->device, "port%d", i);
hsi->port[i]->num = i;
hsi->port[i]->async = hsi_dummy_msg;
hsi->port[i]->setup = hsi_dummy_cl;
hsi->port[i]->flush = hsi_dummy_cl;
hsi->port[i]->start_tx = hsi_dummy_cl;
hsi->port[i]->stop_tx = hsi_dummy_cl;
hsi->port[i]->release = hsi_dummy_cl;
mutex_init(&hsi->port[i]->lock);
BLOCKING_INIT_NOTIFIER_HEAD(&hsi->port[i]->n_head);
dev_set_name(&hsi->port[i]->device, "port%d", i);
hsi->port[i]->device.release = hsi_port_release;
device_initialize(&hsi->port[i]->device);
}

2
include/linux/hsi/hsi.h
View File

@@ -271,7 +271,7 @@ struct hsi_controller {
struct module *owner;
unsigned int id;
unsigned int num_ports;
struct hsi_port **port;
struct hsi_port *port[] __counted_by(num_ports);
};
#define to_hsi_controller(dev) container_of(dev, struct hsi_controller, device)