hwmon: remove () used with return

fix checkpatch ERROR: return is not a function, parentheses are not required Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>

hwmon: remove () used with return
fix checkpatch ERROR: return is not a function, parentheses are not required Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Frans Meulenbroeks · Guenter Roeck
1 parent a6bee4a557
Showing 8 changed files with 32 additions and 32 deletions Side-by-side Diff
drivers/hwmon/atxp1.c
drivers/hwmon/f71805f.c
drivers/hwmon/hwmon-vid.c
drivers/hwmon/pcf8591.c
drivers/hwmon/w83627hf.c
drivers/hwmon/w83792d.c
drivers/hwmon/w83793.c
drivers/hwmon/w83l786ng.c
@@ -106,7 +106,7 @@
  
 	mutex_unlock(&data->update_lock);
  
-	return(data);
+	return data;
 }
  
 /* sys file functions for cpu0_vid */
@@ -202,7 +202,7 @@
  
 static inline long in_from_reg(u8 reg)
 {
-	return (reg * 8);
+	return reg * 8;
 }
  
 /* The 2 least significant bits are not used */
  
@@ -212,13 +212,13 @@
 		return 0;
 	if (val >= 2016)
 		return 0xfc;
-	return (((val + 16) / 32) << 2);
+	return ((val + 16) / 32) << 2;
 }
  
 /* in0 is downscaled by a factor 2 internally */
 static inline long in0_from_reg(u8 reg)
 {
-	return (reg * 16);
+	return reg * 16;
 }
  
 static inline u8 in0_to_reg(long val)
@@ -227,7 +227,7 @@
 		return 0;
 	if (val >= 4032)
 		return 0xfc;
-	return (((val + 32) / 64) << 2);
+	return ((val + 32) / 64) << 2;
 }
  
 /* The 4 most significant bits are not used */
@@ -236,7 +236,7 @@
 	reg &= 0xfff;
 	if (!reg || reg == 0xfff)
 		return 0;
-	return (1500000 / reg);
+	return 1500000 / reg;
 }
  
 static inline u16 fan_to_reg(long rpm)
@@ -246,7 +246,7 @@
 	   so that no alarm will ever trigger. */
 	if (rpm < 367)
 		return 0xfff;
-	return (1500000 / rpm);
+	return 1500000 / rpm;
 }
  
 static inline unsigned long pwm_freq_from_reg(u8 reg)
@@ -278,7 +278,7 @@
  
 static inline long temp_from_reg(u8 reg)
 {
-	return (reg * 1000);
+	return reg * 1000;
 }
  
 static inline u8 temp_to_reg(long val)
@@ -96,14 +96,14 @@
 			vid = 1862500 - (val & 0x1f) * 25000;
 		if(val & 0x20)
 			vid -= 12500;
-		return((vid + 500) / 1000);
+		return (vid + 500) / 1000;
  
 	case 110:		/* Intel Conroe */
 				/* compute in uV, round to mV */
 		val &= 0xff;
 		if (val < 0x02 || val > 0xb2)
 			return 0;
-		return((1600000 - (val - 2) * 6250 + 500) / 1000);
+		return (1600000 - (val - 2) * 6250 + 500) / 1000;
  
 	case 24:		/* Athlon64 & Opteron */
 		val &= 0x1f;
  
  
  
  
  
  
  
@@ -118,38 +118,38 @@
 	case 91:		/* VRM 9.1 */
 	case 90:		/* VRM 9.0 */
 		val &= 0x1f;
-		return(val == 0x1f ? 0 :
-		                       1850 - val * 25);
+		return val == 0x1f ? 0 :
+		                       1850 - val * 25;
  
 	case 85:		/* VRM 8.5 */
 		val &= 0x1f;
-		return((val & 0x10  ? 25 : 0) +
+		return (val & 0x10  ? 25 : 0) +
 		       ((val & 0x0f) > 0x04 ? 2050 : 1250) -
-		       ((val & 0x0f) * 50));
+		       ((val & 0x0f) * 50);
  
 	case 84:		/* VRM 8.4 */
 		val &= 0x0f;
 				/* fall through */
 	case 82:		/* VRM 8.2 */
 		val &= 0x1f;
-		return(val == 0x1f ? 0 :
+		return val == 0x1f ? 0 :
 		       val & 0x10  ? 5100 - (val) * 100 :
-		                     2050 - (val) * 50);
+		                     2050 - (val) * 50;
 	case 17:		/* Intel IMVP-II */
 		val &= 0x1f;
-		return(val & 0x10 ? 975 - (val & 0xF) * 25 :
-				    1750 - val * 50);
+		return val & 0x10 ? 975 - (val & 0xF) * 25 :
+				    1750 - val * 50;
 	case 13:
 	case 131:
 		val &= 0x3f;
 		/* Exception for Eden ULV 500 MHz */
 		if (vrm == 131 && val == 0x3f)
 			val++;
-		return(1708 - val * 16);
+		return 1708 - val * 16;
 	case 14:		/* Intel Core */
 				/* compute in uV, round to mV */
 		val &= 0x7f;
-		return(val > 0x77 ? 0 : (1500000 - (val * 12500) + 500) / 1000);
+		return val > 0x77 ? 0 : (1500000 - (val * 12500) + 500) / 1000;
 	default:		/* report 0 for unknown */
 		if (vrm)
 			pr_warn("Requested unsupported VRM version (%u)\n",
@@ -269,9 +269,9 @@
  
 	if ((channel == 2 && input_mode == 2) ||
 	    (channel != 3 && (input_mode == 1 || input_mode == 3)))
-		return (10 * REG_TO_SIGNED(value));
+		return 10 * REG_TO_SIGNED(value);
 	else
-		return (10 * value);
+		return 10 * value;
 }
  
 static const struct i2c_device_id pcf8591_id[] = {
@@ -313,7 +313,7 @@
 	/* This should not happen but anyway... */
 	if (reg == 0)
 		reg++;
-	return (clock / (reg << 8));
+	return clock / (reg << 8);
 }
 static inline u8 pwm_freq_to_reg(unsigned long val)
 {
  
@@ -321,11 +321,11 @@
 	if (val >= 93750)	/* The highest we can do */
 		return 0x01;
 	if (val >= 720)	/* Use 24 MHz clock */
-		return (24000000UL / (val << 8));
+		return 24000000UL / (val << 8);
 	if (val < 6)		/* The lowest we can do */
 		return 0xFF;
 	else			/* Use 180 kHz clock */
-		return (0x80 | (180000UL / (val << 8)));
+		return 0x80 | (180000UL / (val << 8));
 }
  
 #define BEEP_MASK_FROM_REG(val)		((val) & 0xff7fff)
@@ -342,7 +342,7 @@
 			break;
 		val >>= 1;
 	}
-	return ((u8) i);
+	return (u8)i;
 }
  
 /* For each registered chip, we need to keep some data in memory.
@@ -265,7 +265,7 @@
 			break;
 		val >>= 1;
 	}
-	return ((u8) i);
+	return (u8)i;
 }
  
 struct w83792d_data {
@@ -333,7 +333,7 @@
 static inline long in_count_from_reg(int nr, struct w83792d_data *data)
 {
 	/* in7 and in8 do not have low bits, but the formula still works */
-	return ((data->in[nr] << 2) | ((data->low_bits >> (2 * nr)) & 0x03));
+	return (data->in[nr] << 2) | ((data->low_bits >> (2 * nr)) & 0x03);
 }
  
 /* The SMBus locks itself. The Winbond W83792D chip has a bank register,
@@ -181,7 +181,7 @@
 {
 	if ((val >= 0xfff) || (val == 0))
 		return	0;
-	return (1350000UL / val);
+	return 1350000UL / val;
 }
  
 static inline u16 FAN_TO_REG(long rpm)
@@ -193,7 +193,7 @@
  
 static inline unsigned long TIME_FROM_REG(u8 reg)
 {
-	return (reg * 100);
+	return reg * 100;
 }
  
 static inline u8 TIME_TO_REG(unsigned long val)
@@ -203,7 +203,7 @@
  
 static inline long TEMP_FROM_REG(s8 reg)
 {
-	return (reg * 1000);
+	return reg * 1000;
 }
  
 static inline s8 TEMP_TO_REG(long val, s8 min, s8 max)
@@ -116,7 +116,7 @@
 			break;
 		val >>= 1;
 	}
-	return ((u8) i);
+	return (u8)i;
 }
  
 struct w83l786ng_data {
...	...	@@ -106,7 +106,7 @@
106	106
107	107	mutex_unlock(&data->update_lock);
108	108
109		- return(data);
	109	+ return data;
110	110	}
111	111
112	112	/* sys file functions for cpu0_vid */
...	...	@@ -202,7 +202,7 @@
202	202
203	203	static inline long in_from_reg(u8 reg)
204	204	{
205		- return (reg * 8);
	205	+ return reg * 8;
206	206	}
207	207
208	208	/* The 2 least significant bits are not used */
209	209
...	...	@@ -212,13 +212,13 @@
212	212	return 0;
213	213	if (val >= 2016)
214	214	return 0xfc;
215		- return (((val + 16) / 32) << 2);
	215	+ return ((val + 16) / 32) << 2;
216	216	}
217	217
218	218	/* in0 is downscaled by a factor 2 internally */
219	219	static inline long in0_from_reg(u8 reg)
220	220	{
221		- return (reg * 16);
	221	+ return reg * 16;
222	222	}
223	223
224	224	static inline u8 in0_to_reg(long val)
...	...	@@ -227,7 +227,7 @@
227	227	return 0;
228	228	if (val >= 4032)
229	229	return 0xfc;
230		- return (((val + 32) / 64) << 2);
	230	+ return ((val + 32) / 64) << 2;
231	231	}
232	232
233	233	/* The 4 most significant bits are not used */
...	...	@@ -236,7 +236,7 @@
236	236	reg &= 0xfff;
237	237	if (!reg \|\| reg == 0xfff)
238	238	return 0;
239		- return (1500000 / reg);
	239	+ return 1500000 / reg;
240	240	}
241	241
242	242	static inline u16 fan_to_reg(long rpm)
...	...	@@ -246,7 +246,7 @@
246	246	so that no alarm will ever trigger. */
247	247	if (rpm < 367)
248	248	return 0xfff;
249		- return (1500000 / rpm);
	249	+ return 1500000 / rpm;
250	250	}
251	251
252	252	static inline unsigned long pwm_freq_from_reg(u8 reg)
...	...	@@ -278,7 +278,7 @@
278	278
279	279	static inline long temp_from_reg(u8 reg)
280	280	{
281		- return (reg * 1000);
	281	+ return reg * 1000;
282	282	}
283	283
284	284	static inline u8 temp_to_reg(long val)
...	...	@@ -96,14 +96,14 @@
96	96	vid = 1862500 - (val & 0x1f) * 25000;
97	97	if(val & 0x20)
98	98	vid -= 12500;
99		- return((vid + 500) / 1000);
	99	+ return (vid + 500) / 1000;
100	100
101	101	case 110: /* Intel Conroe */
102	102	/* compute in uV, round to mV */
103	103	val &= 0xff;
104	104	if (val < 0x02 \|\| val > 0xb2)
105	105	return 0;
106		- return((1600000 - (val - 2) * 6250 + 500) / 1000);
	106	+ return (1600000 - (val - 2) * 6250 + 500) / 1000;
107	107
108	108	case 24: /* Athlon64 & Opteron */
109	109	val &= 0x1f;
110	110
111	111
112	112
113	113
114	114
115	115
116	116
...	...	@@ -118,38 +118,38 @@
118	118	case 91: /* VRM 9.1 */
119	119	case 90: /* VRM 9.0 */
120	120	val &= 0x1f;
121		- return(val == 0x1f ? 0 :
122		- 1850 - val * 25);
	121	+ return val == 0x1f ? 0 :
	122	+ 1850 - val * 25;
123	123
124	124	case 85: /* VRM 8.5 */
125	125	val &= 0x1f;
126		- return((val & 0x10 ? 25 : 0) +
	126	+ return (val & 0x10 ? 25 : 0) +
127	127	((val & 0x0f) > 0x04 ? 2050 : 1250) -
128		- ((val & 0x0f) * 50));
	128	+ ((val & 0x0f) * 50);
129	129
130	130	case 84: /* VRM 8.4 */
131	131	val &= 0x0f;
132	132	/* fall through */
133	133	case 82: /* VRM 8.2 */
134	134	val &= 0x1f;
135		- return(val == 0x1f ? 0 :
	135	+ return val == 0x1f ? 0 :
136	136	val & 0x10 ? 5100 - (val) * 100 :
137		- 2050 - (val) * 50);
	137	+ 2050 - (val) * 50;
138	138	case 17: /* Intel IMVP-II */
139	139	val &= 0x1f;
140		- return(val & 0x10 ? 975 - (val & 0xF) * 25 :
141		- 1750 - val * 50);
	140	+ return val & 0x10 ? 975 - (val & 0xF) * 25 :
	141	+ 1750 - val * 50;
142	142	case 13:
143	143	case 131:
144	144	val &= 0x3f;
145	145	/* Exception for Eden ULV 500 MHz */
146	146	if (vrm == 131 && val == 0x3f)
147	147	val++;
148		- return(1708 - val * 16);
	148	+ return 1708 - val * 16;
149	149	case 14: /* Intel Core */
150	150	/* compute in uV, round to mV */
151	151	val &= 0x7f;
152		- return(val > 0x77 ? 0 : (1500000 - (val * 12500) + 500) / 1000);
	152	+ return val > 0x77 ? 0 : (1500000 - (val * 12500) + 500) / 1000;
153	153	default: /* report 0 for unknown */
154	154	if (vrm)
155	155	pr_warn("Requested unsupported VRM version (%u)\n",
...	...	@@ -269,9 +269,9 @@
269	269
270	270	if ((channel == 2 && input_mode == 2) \|\|
271	271	(channel != 3 && (input_mode == 1 \|\| input_mode == 3)))
272		- return (10 * REG_TO_SIGNED(value));
	272	+ return 10 * REG_TO_SIGNED(value);
273	273	else
274		- return (10 * value);
	274	+ return 10 * value;
275	275	}
276	276
277	277	static const struct i2c_device_id pcf8591_id[] = {
...	...	@@ -313,7 +313,7 @@
313	313	/* This should not happen but anyway... */
314	314	if (reg == 0)
315	315	reg++;
316		- return (clock / (reg << 8));
	316	+ return clock / (reg << 8);
317	317	}
318	318	static inline u8 pwm_freq_to_reg(unsigned long val)
319	319	{
320	320
...	...	@@ -321,11 +321,11 @@
321	321	if (val >= 93750) /* The highest we can do */
322	322	return 0x01;
323	323	if (val >= 720) /* Use 24 MHz clock */
324		- return (24000000UL / (val << 8));
	324	+ return 24000000UL / (val << 8);
325	325	if (val < 6) /* The lowest we can do */
326	326	return 0xFF;
327	327	else /* Use 180 kHz clock */
328		- return (0x80 \| (180000UL / (val << 8)));
	328	+ return 0x80 \| (180000UL / (val << 8));
329	329	}
330	330
331	331	#define BEEP_MASK_FROM_REG(val) ((val) & 0xff7fff)
...	...	@@ -342,7 +342,7 @@
342	342	break;
343	343	val >>= 1;
344	344	}
345		- return ((u8) i);
	345	+ return (u8)i;
346	346	}
347	347
348	348	/* For each registered chip, we need to keep some data in memory.
...	...	@@ -265,7 +265,7 @@
265	265	break;
266	266	val >>= 1;
267	267	}
268		- return ((u8) i);
	268	+ return (u8)i;
269	269	}
270	270
271	271	struct w83792d_data {
...	...	@@ -333,7 +333,7 @@
333	333	static inline long in_count_from_reg(int nr, struct w83792d_data *data)
334	334	{
335	335	/* in7 and in8 do not have low bits, but the formula still works */
336		- return ((data->in[nr] << 2) \| ((data->low_bits >> (2 * nr)) & 0x03));
	336	+ return (data->in[nr] << 2) \| ((data->low_bits >> (2 * nr)) & 0x03);
337	337	}
338	338
339	339	/* The SMBus locks itself. The Winbond W83792D chip has a bank register,
...	...	@@ -181,7 +181,7 @@
181	181	{
182	182	if ((val >= 0xfff) \|\| (val == 0))
183	183	return 0;
184		- return (1350000UL / val);
	184	+ return 1350000UL / val;
185	185	}
186	186
187	187	static inline u16 FAN_TO_REG(long rpm)
...	...	@@ -193,7 +193,7 @@
193	193
194	194	static inline unsigned long TIME_FROM_REG(u8 reg)
195	195	{
196		- return (reg * 100);
	196	+ return reg * 100;
197	197	}
198	198
199	199	static inline u8 TIME_TO_REG(unsigned long val)
...	...	@@ -203,7 +203,7 @@
203	203
204	204	static inline long TEMP_FROM_REG(s8 reg)
205	205	{
206		- return (reg * 1000);
	206	+ return reg * 1000;
207	207	}
208	208
209	209	static inline s8 TEMP_TO_REG(long val, s8 min, s8 max)
...	...	@@ -116,7 +116,7 @@
116	116	break;
117	117	val >>= 1;
118	118	}
119		- return ((u8) i);
	119	+ return (u8)i;
120	120	}
121	121
122	122	struct w83l786ng_data {