Commit e233897b authored by Yang Guang's avatar Yang Guang Committed by Greg Kroah-Hartman
Browse files

w1: w1_therm: use swap() to make code cleaner 



Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid
opencoding it.

Reported-by: default avatarZeal Robot <zealci@zte.com.cn>
Signed-off-by: default avatarDavid Yang <davidcomponentone@gmail.com>
Signed-off-by: default avatarYang Guang <yang.guang5@zte.com.cn>
Link: https://lore.kernel.org/r/cb14f9e6e86cf8494ed2ddce6eec8ebd988908d9.1640077704.git.yang.guang5@zte.com.cn


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c95cc0d9

drivers/w1/slaves/w1_therm.c

+3 −4
Original line number Diff line number Diff line
@@ -1785,7 +1785,7 @@ static ssize_t alarms_store(struct device *device, 
	u8 new_config_register[3];	/* array of data to be written */

	int temp, ret;

	char *token = NULL;

	s8 tl, th, tt;	/* 1 byte per value + temp ring order */

	s8 tl, th;	/* 1 byte per value + temp ring order */

	char *p_args, *orig;



	p_args = orig = kmalloc(size, GFP_KERNEL);
@@ -1836,9 +1836,8 @@ static ssize_t alarms_store(struct device *device, 
	th = int_to_short(temp);



	/* Reorder if required th and tl */

	if (tl > th) {

		tt = tl; tl = th; th = tt;

	}

	if (tl > th)

		swap(tl, th);



	/*

	 * Read the scratchpad to change only the required bits