Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b819dc9e authored by Eduardo Valentin's avatar Eduardo Valentin Committed by Zhang Rui
Browse files

thermal: sysfs: use kcalloc() instead of kzalloc() 



Simplify size computation by using kcalloc() for
allocating memory for arrays.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 95e3ed15

drivers/thermal/thermal_sysfs.c

+8 −5
Original line number Diff line number Diff line
@@ -511,7 +511,6 @@ static const struct attribute_group *thermal_zone_attribute_groups[] = { 
 */

static int create_trip_attrs(struct thermal_zone_device *tz, int mask)

{

	int size = sizeof(struct thermal_attr) * tz->trips;

	struct attribute **attrs;

	int indx;
@@ -519,18 +518,22 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) 
	if (tz->trips <= 0)

		return -EINVAL;



	tz->trip_type_attrs = kzalloc(size, GFP_KERNEL);

	tz->trip_type_attrs = kcalloc(tz->trips, sizeof(*tz->trip_type_attrs),

				      GFP_KERNEL);

	if (!tz->trip_type_attrs)

		return -ENOMEM;



	tz->trip_temp_attrs = kzalloc(size, GFP_KERNEL);

	tz->trip_temp_attrs = kcalloc(tz->trips, sizeof(*tz->trip_temp_attrs),

				      GFP_KERNEL);

	if (!tz->trip_temp_attrs) {

		kfree(tz->trip_type_attrs);

		return -ENOMEM;

	}



	if (tz->ops->get_trip_hyst) {

		tz->trip_hyst_attrs = kzalloc(size, GFP_KERNEL);

		tz->trip_hyst_attrs = kcalloc(tz->trips,

					      sizeof(*tz->trip_hyst_attrs),

					      GFP_KERNEL);

		if (!tz->trip_hyst_attrs) {

			kfree(tz->trip_type_attrs);

			kfree(tz->trip_temp_attrs);
@@ -538,7 +541,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) 
		}

	}



	attrs = kzalloc(sizeof(*attrs) * tz->trips * 3 + 1, GFP_KERNEL);

	attrs = kcalloc(tz->trips * 3 + 1, sizeof(*attrs), GFP_KERNEL);

	if (!attrs) {

		kfree(tz->trip_type_attrs);

		kfree(tz->trip_temp_attrs);