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

Commit ec797685 authored by Joe Perches's avatar Joe Perches Committed by Len Brown
Browse files

thermal_sys: remove obfuscating used-once macros 



These don't add any value as they are used only once and the surrounding
code uses similar variable.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Jesper Juhl <jj@chaosbits.net>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 886ee546

drivers/thermal/thermal_sys.c

+12 −20
Original line number Diff line number Diff line
@@ -310,22 +310,6 @@ static struct device_attribute trip_point_attrs[] = { 
	__ATTR(trip_point_11_temp, 0444, trip_point_temp_show, NULL),

};



#define TRIP_POINT_ATTR_ADD(_dev, _index, result)     \

do {    \

	result = device_create_file(_dev,	\

				&trip_point_attrs[_index * 2]);	\

	if (result)	\

		break;	\

	result = device_create_file(_dev,	\

			&trip_point_attrs[_index * 2 + 1]);	\

} while (0)



#define TRIP_POINT_ATTR_REMOVE(_dev, _index)	\

do {	\

	device_remove_file(_dev, &trip_point_attrs[_index * 2]);	\

	device_remove_file(_dev, &trip_point_attrs[_index * 2 + 1]);	\

} while (0)



/* sys I/F for cooling device */

#define to_cooling_device(_dev)	\

	container_of(_dev, struct thermal_cooling_device, device)
@@ -1196,7 +1180,12 @@ struct thermal_zone_device *thermal_zone_device_register(char *type, 
	}



	for (count = 0; count < trips; count++) {

		TRIP_POINT_ATTR_ADD(&tz->device, count, result);

		result = device_create_file(&tz->device,

					    &trip_point_attrs[count * 2]);

		if (result)

			break;

		result = device_create_file(&tz->device,

					    &trip_point_attrs[count * 2 + 1]);

		if (result)

			goto unregister;

		tz->ops->get_trip_type(tz, count, &trip_type);
@@ -1276,9 +1265,12 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) 
	if (tz->ops->get_mode)

		device_remove_file(&tz->device, &dev_attr_mode);



	for (count = 0; count < tz->trips; count++)

		TRIP_POINT_ATTR_REMOVE(&tz->device, count);



	for (count = 0; count < tz->trips; count++) {

		device_remove_file(&tz->device,

				   &trip_point_attrs[count * 2]);

		device_remove_file(&tz->device,

				   &trip_point_attrs[count * 2 + 1]);

	}

	thermal_remove_hwmon_sysfs(tz);

	release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);

	idr_destroy(&tz->idr);