Commit e384b69a authored by Aya Mahfouz's avatar Aya Mahfouz Committed by Greg Kroah-Hartman
Browse files

staging: iio: meter: add check on return variables 



adds checks on variables that are used to return values. If
the value is less than zero, this indicates that an error
occurred and hence a message is printed through dev_err.
Checks are made on negative values only since spi_* functions
return negative error codes.

The functions were found using the following script but the
aforementioned modification was what was carried out in the end:
@@
identifier len,f;
@@

-int len;
 ... when != len
     when strict
-len =
+return
        f(...);
-return len;

Signed-off-by: default avatarAya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 82d28561

drivers/staging/iio/meter/ade7758_core.c

+16 −14
Original line number Diff line number Diff line
@@ -303,14 +303,15 @@ static int ade7758_reset(struct device *dev) 
	int ret;

	u8 val;



	ade7758_spi_read_reg_8(dev,

			ADE7758_OPMODE,

			&val);

	ret = ade7758_spi_read_reg_8(dev, ADE7758_OPMODE, &val);

	if (ret < 0) {

		dev_err(dev, "Failed to read opmode reg\n");

		return ret;

	}

	val |= 1 << 6; /* Software Chip Reset */

	ret = ade7758_spi_write_reg_8(dev,

			ADE7758_OPMODE,

			val);



	ret = ade7758_spi_write_reg_8(dev, ADE7758_OPMODE, val);

	if (ret < 0)

		dev_err(dev, "Failed to write opmode reg\n");

	return ret;

}
@@ -444,14 +445,15 @@ static int ade7758_stop_device(struct device *dev) 
	int ret;

	u8 val;



	ade7758_spi_read_reg_8(dev,

			ADE7758_OPMODE,

			&val);

	ret = ade7758_spi_read_reg_8(dev, ADE7758_OPMODE, &val);

	if (ret < 0) {

		dev_err(dev, "Failed to read opmode reg\n");

		return ret;

	}

	val |= 7 << 3;  /* ADE7758 powered down */

	ret = ade7758_spi_write_reg_8(dev,

			ADE7758_OPMODE,

			val);



	ret = ade7758_spi_write_reg_8(dev, ADE7758_OPMODE, val);

	if (ret < 0)

		dev_err(dev, "Failed to write opmode reg\n");

	return ret;

}