Unverified Commit b7a253db authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: avs: Replace devm_kzalloc() with 

Merge series from Ethan Carter Edwards <ethan@ethancedwards.com>:

Open coded arithmetic in allocator arguments is discouraged. Helper
functions like kcalloc or, in this case, devm_kcalloc are preferred. Not
only for readability purposes but safety purposes.

The changes move `devm_kzalloc(dev, sizeof(var) * n, GFP_KERNEL)` to
the helper function `devm_kcalloc(dev, n, sizeof(var), GFP_KERNEL)`.

Here is a series of four patches within the Intel/avs drivers that make
these changes. They are all compile tested only but should have no
effect on runtime behaviour.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments
Link: https://github.com/KSPP/linux/issues/162
parents 1822c448 3602571b

sound/soc/intel/avs/boards/max98373.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in 
	dl->name = devm_kasprintf(dev, GFP_KERNEL,

				  AVS_STRING_FMT("SSP", "-Codec", ssp_port, tdm_slot));

	dl->cpus = devm_kzalloc(dev, sizeof(*dl->cpus), GFP_KERNEL);

	dl->codecs = devm_kzalloc(dev, sizeof(*dl->codecs) * 2, GFP_KERNEL);

	dl->codecs = devm_kcalloc(dev, 2, sizeof(*dl->codecs), GFP_KERNEL);

	if (!dl->name || !dl->cpus || !dl->codecs)

		return -ENOMEM;

sound/soc/intel/avs/boards/max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in 
	dl->name = devm_kasprintf(dev, GFP_KERNEL,

				  AVS_STRING_FMT("SSP", "-Codec", ssp_port, tdm_slot));

	dl->cpus = devm_kzalloc(dev, sizeof(*dl->cpus), GFP_KERNEL);

	dl->codecs = devm_kzalloc(dev, sizeof(*dl->codecs) * 2, GFP_KERNEL);

	dl->codecs = devm_kcalloc(dev, 2, sizeof(*dl->codecs), GFP_KERNEL);

	if (!dl->name || !dl->cpus || !dl->codecs)

		return -ENOMEM;

sound/soc/intel/avs/boards/ssm4567.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in 
	dl->name = devm_kasprintf(dev, GFP_KERNEL,

				  AVS_STRING_FMT("SSP", "-Codec", ssp_port, tdm_slot));

	dl->cpus = devm_kzalloc(dev, sizeof(*dl->cpus), GFP_KERNEL);

	dl->codecs = devm_kzalloc(dev, sizeof(*dl->codecs) * 2, GFP_KERNEL);

	dl->codecs = devm_kcalloc(dev, 2, sizeof(*dl->codecs), GFP_KERNEL);

	if (!dl->name || !dl->cpus || !dl->codecs)

		return -ENOMEM;

sound/soc/intel/avs/pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -1380,7 +1380,7 @@ int avs_i2s_platform_register(struct avs_dev *adev, const char *name, unsigned l 
		for_each_set_bit(i, &port_mask, ssp_count)

			cpu_count += hweight_long(tdms[i]);



	cpus = devm_kzalloc(adev->dev, sizeof(*cpus) * cpu_count, GFP_KERNEL);

	cpus = devm_kcalloc(adev->dev, cpu_count, sizeof(*cpus), GFP_KERNEL);

	if (!cpus)

		return -ENOMEM;