diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2016-06-19 04:58:26 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2016-07-09 17:35:41 +0200 |
| commit | 589f707c72426793a0f537592098a5a2a3117dc0 (patch) | |
| tree | 9f1f66949e5d4b356ab3e73de80baead30c2a283 /drivers/hwmon/lm90.c | |
| parent | hwmon: (lm90) Use bool for valid flag (diff) | |
| download | linux-589f707c72426793a0f537592098a5a2a3117dc0.tar.xz linux-589f707c72426793a0f537592098a5a2a3117dc0.zip | |
hwmon: (lm90) Drop unnecessary else statements
checkpatch rightfully complains that else after return is unnecessary.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/lm90.c')
| -rw-r--r-- | drivers/hwmon/lm90.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c index c38d6e4e95b5..f51e758ba529 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c @@ -790,16 +790,14 @@ static inline int temp_from_u8_adt7461(struct lm90_data *data, u8 val) { if (data->flags & LM90_FLAG_ADT7461_EXT) return (val - 64) * 1000; - else - return temp_from_s8(val); + return temp_from_s8(val); } static inline int temp_from_u16_adt7461(struct lm90_data *data, u16 val) { if (data->flags & LM90_FLAG_ADT7461_EXT) return (val - 0x4000) / 64 * 250; - else - return temp_from_s16(val); + return temp_from_s16(val); } static u8 temp_to_u8_adt7461(struct lm90_data *data, long val) @@ -810,13 +808,12 @@ static u8 temp_to_u8_adt7461(struct lm90_data *data, long val) if (val >= 191000) return 0xFF; return (val + 500 + 64000) / 1000; - } else { - if (val <= 0) - return 0; - if (val >= 127000) - return 127; - return (val + 500) / 1000; } + if (val <= 0) + return 0; + if (val >= 127000) + return 127; + return (val + 500) / 1000; } static u16 temp_to_u16_adt7461(struct lm90_data *data, long val) @@ -827,13 +824,12 @@ static u16 temp_to_u16_adt7461(struct lm90_data *data, long val) if (val >= 191750) return 0xFFC0; return (val + 64000 + 125) / 250 * 64; - } else { - if (val <= 0) - return 0; - if (val >= 127750) - return 0x7FC0; - return (val + 125) / 250 * 64; } + if (val <= 0) + return 0; + if (val >= 127750) + return 0x7FC0; + return (val + 125) / 250 * 64; } /* |