Andrew Lukoshko
b3393f484c
Drop the 211.7.x security-ahead patches superseded by the RHEL 211.8.1..211.16.1 backports (1100-1104), add those backports (1106-1161) from centos-stream-10 and upstream linux-6.12.y. Keep the smb cifs.spnego ahead-fix (1105). Bump to 211.16.1.
72 lines
2.7 KiB
Diff
72 lines
2.7 KiB
Diff
From aa6ff47bec14a3ff3e61d5156611282ea4af0cd5 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <jkysela@redhat.com>
|
|
Date: Thu, 5 Mar 2026 15:06:49 +0100
|
|
Subject: [PATCH] ASoC: SDCA: Tidy up some memory allocations
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-85741
|
|
|
|
commit 61d2a7699ab39d448f44919ef15c16187e6f70ec
|
|
Author: Charles Keepax <ckeepax@opensource.cirrus.com>
|
|
Date: Thu Jan 15 11:46:07 2026 +0000
|
|
|
|
ASoC: SDCA: Tidy up some memory allocations
|
|
|
|
It is slightly better to deference the type being allocate for a sizeof
|
|
rather than manually using the type. Saves effort if types change in the
|
|
future. This results in no functional changes, just tidies up the style
|
|
of the code a little.
|
|
|
|
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
|
|
Link: https://patch.msgid.link/20260115114607.271990-1-ckeepax@opensource.cirrus.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
|
|
Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
|
|
|
|
diff --git a/sound/soc/sdca/sdca_fdl.c b/sound/soc/sdca/sdca_fdl.c
|
|
index 3180ebd07c40..8bee9f23c473 100644
|
|
--- a/sound/soc/sdca/sdca_fdl.c
|
|
+++ b/sound/soc/sdca/sdca_fdl.c
|
|
@@ -487,7 +487,7 @@ int sdca_fdl_alloc_state(struct sdca_interrupt *interrupt)
|
|
struct device *dev = interrupt->dev;
|
|
struct fdl_state *fdl_state;
|
|
|
|
- fdl_state = devm_kzalloc(dev, sizeof(struct fdl_state), GFP_KERNEL);
|
|
+ fdl_state = devm_kzalloc(dev, sizeof(*fdl_state), GFP_KERNEL);
|
|
if (!fdl_state)
|
|
return -ENOMEM;
|
|
|
|
diff --git a/sound/soc/sdca/sdca_functions.c b/sound/soc/sdca/sdca_functions.c
|
|
index acac066f1d8d..80c71116e6d4 100644
|
|
--- a/sound/soc/sdca/sdca_functions.c
|
|
+++ b/sound/soc/sdca/sdca_functions.c
|
|
@@ -952,7 +952,7 @@ static int find_sdca_entity_control(struct device *dev, struct sdca_entity *enti
|
|
}
|
|
|
|
control->values = devm_kcalloc(dev, hweight64(control->cn_list),
|
|
- sizeof(int), GFP_KERNEL);
|
|
+ sizeof(*control->values), GFP_KERNEL);
|
|
if (!control->values)
|
|
return -ENOMEM;
|
|
|
|
@@ -2048,7 +2048,7 @@ static int find_sdca_filesets(struct device *dev, struct sdw_slave *sdw,
|
|
fwnode_property_read_u32_array(function_node, "mipi-sdca-file-set-id-list",
|
|
filesets_list, num_sets);
|
|
|
|
- sets = devm_kcalloc(dev, num_sets, sizeof(struct sdca_fdl_set), GFP_KERNEL);
|
|
+ sets = devm_kcalloc(dev, num_sets, sizeof(*sets), GFP_KERNEL);
|
|
if (!sets)
|
|
return -ENOMEM;
|
|
|
|
@@ -2074,7 +2074,7 @@ static int find_sdca_filesets(struct device *dev, struct sdw_slave *sdw,
|
|
dev_dbg(dev, "fileset: %#x\n", filesets_list[i]);
|
|
|
|
files = devm_kcalloc(dev, num_entries / mult_fileset,
|
|
- sizeof(struct sdca_fdl_file), GFP_KERNEL);
|
|
+ sizeof(*files), GFP_KERNEL);
|
|
if (!files)
|
|
return -ENOMEM;
|
|
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|