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

Commit eae1415d authored by Guenter Roeck's avatar Guenter Roeck Committed by Guenter Roeck
Browse files

hwmon: (ad7314) Fix build warning 



The following build warning is seen in some configurations.

drivers/hwmon/ad7314.c: In function 'ad7314_show_temperature':
drivers/hwmon/ad7314.c:70: warning: 'data' may be used uninitialized in this function

Fix by overloading the return value from ad7314_spi_read with both data and
error code (the returned data is really u16 and needs to be converted into a
signed value anyway).

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
parent 66f75a5d

drivers/hwmon/ad7314.c

+5 −7
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ struct ad7314_data { 
	u16 rx ____cacheline_aligned;

};



static int ad7314_spi_read(struct ad7314_data *chip, s16 *data)

static int ad7314_spi_read(struct ad7314_data *chip)

{

	int ret;
@@ -57,9 +57,7 @@ static int ad7314_spi_read(struct ad7314_data *chip, s16 *data) 
		return ret;

	}



	*data = be16_to_cpu(chip->rx);



	return ret;

	return be16_to_cpu(chip->rx);

}



static ssize_t ad7314_show_temperature(struct device *dev,
@@ -70,12 +68,12 @@ static ssize_t ad7314_show_temperature(struct device *dev, 
	s16 data;

	int ret;



	ret = ad7314_spi_read(chip, &data);

	ret = ad7314_spi_read(chip);

	if (ret < 0)

		return ret;

	switch (spi_get_device_id(chip->spi_dev)->driver_data) {

	case ad7314:

		data = (data & AD7314_TEMP_MASK) >> AD7314_TEMP_OFFSET;

		data = (ret & AD7314_TEMP_MASK) >> AD7314_TEMP_OFFSET;

		data = (data << 6) >> 6;



		return sprintf(buf, "%d\n", 250 * data);
@@ -86,7 +84,7 @@ static ssize_t ad7314_show_temperature(struct device *dev, 
		 * with a sign bit - which is a 14 bit 2's complement

		 * register.  1lsb - 31.25 milli degrees centigrade

		 */

		data &= ADT7301_TEMP_MASK;

		data = ret & ADT7301_TEMP_MASK;

		data = (data << 2) >> 2;



		return sprintf(buf, "%d\n",