summaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/slaves/w1_therm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index a6c85e486671..c1b4eda16719 100644
--- 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(struct w1_slave *sl,
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_resolution(struct w1_slave *sl, int val)
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 *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 device *device,
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;