aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2013-01-10 13:48:34 -0500
committerGuenter Roeck <linux@roeck-us.net>2013-04-08 00:16:40 -0400
commitf539038e0b26b88baf6caad9402ce17ab8256aac (patch)
tree807f2405dac515c6e12c0d17226139701d60e7a4
parentb5f0f1eadf14d7afad8c8c7aadee7527082efaac (diff)
hwmon: (ltc4245) Fix 'Macros with complex values' checkpatch error
Fix: ERROR: Macros with complex values should be enclosed in parenthesis by unwinding the problematic macros. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--drivers/hwmon/ltc4245.c116
1 files changed, 59 insertions, 57 deletions
diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c
index 3653f79dc2de..cdc1ecc6734d 100644
--- a/drivers/hwmon/ltc4245.c
+++ b/drivers/hwmon/ltc4245.c
@@ -319,80 +319,82 @@ static ssize_t ltc4245_show_gpio(struct device *dev,
319 return snprintf(buf, PAGE_SIZE, "%u\n", val * 10); 319 return snprintf(buf, PAGE_SIZE, "%u\n", val * 10);
320} 320}
321 321
322/*
323 * These macros are used below in constructing device attribute objects
324 * for use with sysfs_create_group() to make a sysfs device file
325 * for each register.
326 */
327
328#define LTC4245_VOLTAGE(name, ltc4245_cmd_idx) \
329 static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
330 ltc4245_show_voltage, NULL, ltc4245_cmd_idx)
331
332#define LTC4245_CURRENT(name, ltc4245_cmd_idx) \
333 static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
334 ltc4245_show_current, NULL, ltc4245_cmd_idx)
335
336#define LTC4245_POWER(name, ltc4245_cmd_idx) \
337 static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
338 ltc4245_show_power, NULL, ltc4245_cmd_idx)
339
340#define LTC4245_ALARM(name, mask, reg) \
341 static SENSOR_DEVICE_ATTR_2(name, S_IRUGO, \
342 ltc4245_show_alarm, NULL, (mask), reg)
343
344#define LTC4245_GPIO_VOLTAGE(name, gpio_num) \
345 static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
346 ltc4245_show_gpio, NULL, gpio_num)
347
348/* Construct a sensor_device_attribute structure for each register */ 322/* Construct a sensor_device_attribute structure for each register */
349 323
350/* Input voltages */ 324/* Input voltages */
351LTC4245_VOLTAGE(in1_input, LTC4245_12VIN); 325static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, ltc4245_show_voltage, NULL,
352LTC4245_VOLTAGE(in2_input, LTC4245_5VIN); 326 LTC4245_12VIN);
353LTC4245_VOLTAGE(in3_input, LTC4245_3VIN); 327static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, ltc4245_show_voltage, NULL,
354LTC4245_VOLTAGE(in4_input, LTC4245_VEEIN); 328 LTC4245_5VIN);
329static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, ltc4245_show_voltage, NULL,
330 LTC4245_3VIN);
331static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, ltc4245_show_voltage, NULL,
332 LTC4245_VEEIN);
355 333
356/* Input undervoltage alarms */ 334/* Input undervoltage alarms */
357LTC4245_ALARM(in1_min_alarm, (1 << 0), LTC4245_FAULT1); 335static SENSOR_DEVICE_ATTR_2(in1_min_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
358LTC4245_ALARM(in2_min_alarm, (1 << 1), LTC4245_FAULT1); 336 1 << 0, LTC4245_FAULT1);
359LTC4245_ALARM(in3_min_alarm, (1 << 2), LTC4245_FAULT1); 337static SENSOR_DEVICE_ATTR_2(in2_min_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
360LTC4245_ALARM(in4_min_alarm, (1 << 3), LTC4245_FAULT1); 338 1 << 1, LTC4245_FAULT1);
339static SENSOR_DEVICE_ATTR_2(in3_min_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
340 1 << 2, LTC4245_FAULT1);
341static SENSOR_DEVICE_ATTR_2(in4_min_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
342 1 << 3, LTC4245_FAULT1);
361 343
362/* Currents (via sense resistor) */ 344/* Currents (via sense resistor) */
363LTC4245_CURRENT(curr1_input, LTC4245_12VSENSE); 345static SENSOR_DEVICE_ATTR(curr1_input, S_IRUGO, ltc4245_show_current, NULL,
364LTC4245_CURRENT(curr2_input, LTC4245_5VSENSE); 346 LTC4245_12VSENSE);
365LTC4245_CURRENT(curr3_input, LTC4245_3VSENSE); 347static SENSOR_DEVICE_ATTR(curr2_input, S_IRUGO, ltc4245_show_current, NULL,
366LTC4245_CURRENT(curr4_input, LTC4245_VEESENSE); 348 LTC4245_5VSENSE);
349static SENSOR_DEVICE_ATTR(curr3_input, S_IRUGO, ltc4245_show_current, NULL,
350 LTC4245_3VSENSE);
351static SENSOR_DEVICE_ATTR(curr4_input, S_IRUGO, ltc4245_show_current, NULL,
352 LTC4245_VEESENSE);
367 353
368/* Overcurrent alarms */ 354/* Overcurrent alarms */
369LTC4245_ALARM(curr1_max_alarm, (1 << 4), LTC4245_FAULT1); 355static SENSOR_DEVICE_ATTR_2(curr1_max_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
370LTC4245_ALARM(curr2_max_alarm, (1 << 5), LTC4245_FAULT1); 356 1 << 4, LTC4245_FAULT1);
371LTC4245_ALARM(curr3_max_alarm, (1 << 6), LTC4245_FAULT1); 357static SENSOR_DEVICE_ATTR_2(curr2_max_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
372LTC4245_ALARM(curr4_max_alarm, (1 << 7), LTC4245_FAULT1); 358 1 << 5, LTC4245_FAULT1);
359static SENSOR_DEVICE_ATTR_2(curr3_max_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
360 1 << 6, LTC4245_FAULT1);
361static SENSOR_DEVICE_ATTR_2(curr4_max_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
362 1 << 7, LTC4245_FAULT1);
373 363
374/* Output voltages */ 364/* Output voltages */
375LTC4245_VOLTAGE(in5_input, LTC4245_12VOUT); 365static SENSOR_DEVICE_ATTR(in5_input, S_IRUGO, ltc4245_show_voltage, NULL,
376LTC4245_VOLTAGE(in6_input, LTC4245_5VOUT); 366 LTC4245_12VOUT);
377LTC4245_VOLTAGE(in7_input, LTC4245_3VOUT); 367static SENSOR_DEVICE_ATTR(in6_input, S_IRUGO, ltc4245_show_voltage, NULL,
378LTC4245_VOLTAGE(in8_input, LTC4245_VEEOUT); 368 LTC4245_5VOUT);
369static SENSOR_DEVICE_ATTR(in7_input, S_IRUGO, ltc4245_show_voltage, NULL,
370 LTC4245_3VOUT);
371static SENSOR_DEVICE_ATTR(in8_input, S_IRUGO, ltc4245_show_voltage, NULL,
372 LTC4245_VEEOUT);
379 373
380/* Power Bad alarms */ 374/* Power Bad alarms */
381LTC4245_ALARM(in5_min_alarm, (1 << 0), LTC4245_FAULT2); 375static SENSOR_DEVICE_ATTR_2(in5_min_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
382LTC4245_ALARM(in6_min_alarm, (1 << 1), LTC4245_FAULT2); 376 1 << 0, LTC4245_FAULT2);
383LTC4245_ALARM(in7_min_alarm, (1 << 2), LTC4245_FAULT2); 377static SENSOR_DEVICE_ATTR_2(in6_min_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
384LTC4245_ALARM(in8_min_alarm, (1 << 3), LTC4245_FAULT2); 378 1 << 1, LTC4245_FAULT2);
379static SENSOR_DEVICE_ATTR_2(in7_min_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
380 1 << 2, LTC4245_FAULT2);
381static SENSOR_DEVICE_ATTR_2(in8_min_alarm, S_IRUGO, ltc4245_show_alarm, NULL,
382 1 << 3, LTC4245_FAULT2);
385 383
386/* GPIO voltages */ 384/* GPIO voltages */
387LTC4245_GPIO_VOLTAGE(in9_input, 0); 385static SENSOR_DEVICE_ATTR(in9_input, S_IRUGO, ltc4245_show_gpio, NULL, 0);
388LTC4245_GPIO_VOLTAGE(in10_input, 1); 386static SENSOR_DEVICE_ATTR(in10_input, S_IRUGO, ltc4245_show_gpio, NULL, 1);
389LTC4245_GPIO_VOLTAGE(in11_input, 2); 387static SENSOR_DEVICE_ATTR(in11_input, S_IRUGO, ltc4245_show_gpio, NULL, 2);
390 388
391/* Power Consumption (virtual) */ 389/* Power Consumption (virtual) */
392LTC4245_POWER(power1_input, LTC4245_12VSENSE); 390static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, ltc4245_show_power, NULL,
393LTC4245_POWER(power2_input, LTC4245_5VSENSE); 391 LTC4245_12VSENSE);
394LTC4245_POWER(power3_input, LTC4245_3VSENSE); 392static SENSOR_DEVICE_ATTR(power2_input, S_IRUGO, ltc4245_show_power, NULL,
395LTC4245_POWER(power4_input, LTC4245_VEESENSE); 393 LTC4245_5VSENSE);
394static SENSOR_DEVICE_ATTR(power3_input, S_IRUGO, ltc4245_show_power, NULL,
395 LTC4245_3VSENSE);
396static SENSOR_DEVICE_ATTR(power4_input, S_IRUGO, ltc4245_show_power, NULL,
397 LTC4245_VEESENSE);
396 398
397/* 399/*
398 * Finally, construct an array of pointers to members of the above objects, 400 * Finally, construct an array of pointers to members of the above objects,