aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2016-06-18 22:58:26 -0400
committerGuenter Roeck <linux@roeck-us.net>2016-07-09 11:35:41 -0400
commit589f707c72426793a0f537592098a5a2a3117dc0 (patch)
tree9f1f66949e5d4b356ab3e73de80baead30c2a283
parent2f83ab77b43807edf695ca9a31673be2197a33b3 (diff)
hwmon: (lm90) Drop unnecessary else statements
checkpatch rightfully complains that else after return is unnecessary. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--drivers/hwmon/lm90.c28
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)
790{ 790{
791 if (data->flags & LM90_FLAG_ADT7461_EXT) 791 if (data->flags & LM90_FLAG_ADT7461_EXT)
792 return (val - 64) * 1000; 792 return (val - 64) * 1000;
793 else 793 return temp_from_s8(val);
794 return temp_from_s8(val);
795} 794}
796 795
797static inline int temp_from_u16_adt7461(struct lm90_data *data, u16 val) 796static inline int temp_from_u16_adt7461(struct lm90_data *data, u16 val)
798{ 797{
799 if (data->flags & LM90_FLAG_ADT7461_EXT) 798 if (data->flags & LM90_FLAG_ADT7461_EXT)
800 return (val - 0x4000) / 64 * 250; 799 return (val - 0x4000) / 64 * 250;
801 else 800 return temp_from_s16(val);
802 return temp_from_s16(val);
803} 801}
804 802
805static u8 temp_to_u8_adt7461(struct lm90_data *data, long val) 803static 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)
810 if (val >= 191000) 808 if (val >= 191000)
811 return 0xFF; 809 return 0xFF;
812 return (val + 500 + 64000) / 1000; 810 return (val + 500 + 64000) / 1000;
813 } else {
814 if (val <= 0)
815 return 0;
816 if (val >= 127000)
817 return 127;
818 return (val + 500) / 1000;
819 } 811 }
812 if (val <= 0)
813 return 0;
814 if (val >= 127000)
815 return 127;
816 return (val + 500) / 1000;
820} 817}
821 818
822static u16 temp_to_u16_adt7461(struct lm90_data *data, long val) 819static 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)
827 if (val >= 191750) 824 if (val >= 191750)
828 return 0xFFC0; 825 return 0xFFC0;
829 return (val + 64000 + 125) / 250 * 64; 826 return (val + 64000 + 125) / 250 * 64;
830 } else {
831 if (val <= 0)
832 return 0;
833 if (val >= 127750)
834 return 0x7FC0;
835 return (val + 125) / 250 * 64;
836 } 827 }
828 if (val <= 0)
829 return 0;
830 if (val >= 127750)
831 return 0x7FC0;
832 return (val + 125) / 250 * 64;
837} 833}
838 834
839/* 835/*