Openwrt/target/linux/bcm27xx/patches-5.4/950-0775-w1_therm-remove-redundant-assignments-to-variable-re.patch
Álvaro Fernández Rojas f07e572f64 bcm27xx: import latest patches from the RPi foundation
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2021-02-18 23:42:32 +01:00

59 lines
1.9 KiB
Diff

From 7566655c9e659e890f44784a6403de98ad77ae5b Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.king@canonical.com>
Date: Tue, 19 May 2020 16:45:53 +0100
Subject: [PATCH] w1_therm: remove redundant assignments to variable
ret
commit f37d13d52c0560bd2bac40b22466af538e61a5ce upstream.
The variable ret is being initialized with a value that is never read
and it is being updated later with a new value. The initialization
is redundant and can be removed.
Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20200519154553.873413-1-colin.king@canonical.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/w1/slaves/w1_therm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -505,7 +505,7 @@ static inline int w1_DS18S20_write_data(
static inline int w1_DS18B20_set_resolution(struct w1_slave *sl, int val)
{
- int ret = -ENODEV;
+ int ret;
u8 new_config_register[3]; /* array of data to be written */
struct therm_info info;
@@ -538,7 +538,7 @@ static inline int w1_DS18B20_set_resolut
static inline int w1_DS18B20_get_resolution(struct w1_slave *sl)
{
- int ret = -ENODEV;
+ int ret;
u8 config_register;
struct therm_info info;
@@ -1499,7 +1499,7 @@ static ssize_t alarms_show(struct device
struct device_attribute *attr, char *buf)
{
struct w1_slave *sl = dev_to_w1_slave(device);
- int ret = -ENODEV;
+ int ret;
s8 th = 0, tl = 0;
struct therm_info scratchpad;
@@ -1523,7 +1523,7 @@ static ssize_t alarms_store(struct devic
struct w1_slave *sl = dev_to_w1_slave(device);
struct therm_info info;
u8 new_config_register[3]; /* array of data to be written */
- int temp, ret = -EINVAL;
+ int temp, ret;
char *token = NULL;
s8 tl, th, tt; /* 1 byte per value + temp ring order */
char *p_args, *orig;