Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid dynamic memory allocation #84

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Avoid dynamic memory allocation #84

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfdceb6
Avoid dynamic memory allocation
teackot Oct 9, 2023
042beea
Use ARRAY_SIZE
teackot Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 20 additions & 31 deletions msi-ec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2174,24 +2174,16 @@ static const struct attribute_group *msi_platform_groups[] = {
};

/*
* Creates an array of supported attributes
* Return value has to be freed manually
*/
static struct attribute **filter_attributes(struct attribute_support *attributes,
size_t size)
* Copies supported attributes from `attributes` to `filtered`
*/
static void filter_attributes(struct attribute_support *attributes,
struct attribute **filtered,
size_t size)
{
struct attribute **filtered =
kcalloc(size + 1, sizeof(struct attribute *), GFP_KERNEL);
if (!filtered)
return NULL;

// copy supported attributes only
for (int i = 0, j = 0; i < size; i++) {
if (attributes[i].supported)
filtered[j++] = attributes[i].attribute;
}

return filtered;
}

static int msi_platform_probe(struct platform_device *pdev)
Expand Down Expand Up @@ -2263,12 +2255,10 @@ static int msi_platform_probe(struct platform_device *pdev)
true,
},
};
static struct attribute *root_attrs[ARRAY_SIZE(root_attrs_support) + 1] = {0};

msi_root_group.attrs =
filter_attributes(root_attrs_support,
sizeof(root_attrs_support) / sizeof(root_attrs_support[0]));
if (!msi_root_group.attrs)
return -ENOMEM;
filter_attributes(root_attrs_support, root_attrs, ARRAY_SIZE(root_attrs_support));
msi_root_group.attrs = root_attrs;

/* cpu group */

Expand All @@ -2286,12 +2276,13 @@ static int msi_platform_probe(struct platform_device *pdev)
conf.cpu.bs_fan_speed_address != MSI_EC_ADDR_UNSUPP,
},
};
static struct attribute *cpu_attrs[
sizeof(cpu_attrs_support) / sizeof(cpu_attrs_support[0]) + 1] = {0};

msi_cpu_group.attrs =
filter_attributes(cpu_attrs_support,
sizeof(cpu_attrs_support) / sizeof(cpu_attrs_support[0]));
if (!msi_cpu_group.attrs)
return -ENOMEM;
filter_attributes(cpu_attrs_support,
cpu_attrs,
sizeof(cpu_attrs_support) / sizeof(cpu_attrs_support[0]));
msi_cpu_group.attrs = cpu_attrs;

/* gpu group */

Expand All @@ -2305,12 +2296,13 @@ static int msi_platform_probe(struct platform_device *pdev)
conf.gpu.rt_fan_speed_address != MSI_EC_ADDR_UNSUPP,
},
};
static struct attribute *gpu_attrs[
sizeof(gpu_attrs_support) / sizeof(gpu_attrs_support[0]) + 1] = {0};

msi_gpu_group.attrs =
filter_attributes(gpu_attrs_support,
sizeof(gpu_attrs_support) / sizeof(gpu_attrs_support[0]));
if (!msi_gpu_group.attrs)
return -ENOMEM;
filter_attributes(gpu_attrs_support,
gpu_attrs,
sizeof(gpu_attrs_support) / sizeof(gpu_attrs_support[0]));
msi_gpu_group.attrs = gpu_attrs;

return sysfs_create_groups(&pdev->dev.kobj, msi_platform_groups);
}
Expand All @@ -2322,9 +2314,6 @@ static int msi_platform_remove(struct platform_device *pdev)

if (conf_loaded) {
sysfs_remove_groups(&pdev->dev.kobj, msi_platform_groups);
kfree(msi_root_group.attrs);
kfree(msi_cpu_group.attrs);
kfree(msi_gpu_group.attrs);
}

return 0;
Expand Down