mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

hwmon: (pmbus/mp2975) Replace home made version of __assign_bit()

Browse source 
The newly introduced SWAP() macro is quite generic by naming, but
moreover it's a repetition of the existing __assign_bit().
With this applied, add a missing bits.h (via now required bitops.h).

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240325120952.3019767-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Andy Shevchenko 2024-03-25 14:07:42 +02:00 committed by Guenter Roeck
parent 9c3793629d
commit d2bc4a994a
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/hwmon/pmbus/mp2975.c
View file

@ -5,6 +5,7 @@
* Copyright (C) 2020 Nvidia Technologies Ltd. * Copyright (C) 2020 Nvidia Technologies Ltd.
*/ */
#include <linux/bitops.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/init.h> #include <linux/init.h>
@ -396,7 +397,7 @@ static int mp2973_write_word_data(struct i2c_client *client, int page,
int reg, u16 word) int reg, u16 word)
{ {
u8 target, mask; u8 target, mask;
int ret; long ret;
if (reg != PMBUS_SMBALERT_MASK) if (reg != PMBUS_SMBALERT_MASK)
return -ENODATA; return -ENODATA;
@ -415,7 +416,6 @@ static int mp2973_write_word_data(struct i2c_client *client, int page,
* Set/Clear 'bit' in 'ret' based on condition followed by define for each bit in SMBALERT_MASK. * Set/Clear 'bit' in 'ret' based on condition followed by define for each bit in SMBALERT_MASK.
* Also bit 2 & 15 are reserved. * Also bit 2 & 15 are reserved.
*/ */
#define SWAP(val, mask, cond, bit) (((mask) & (cond)) ? ((val) & ~BIT(bit)) : ((val) | BIT(bit)))
#define MP2973_TEMP_OT 0 #define MP2973_TEMP_OT 0
#define MP2973_VIN_UVLO 1 #define MP2973_VIN_UVLO 1
@ -434,36 +434,35 @@ static int mp2973_write_word_data(struct i2c_client *client, int page,
switch (target) { switch (target) {
case PMBUS_STATUS_CML: case PMBUS_STATUS_CML:
ret = SWAP(ret, mask, PB_CML_FAULT_INVALID_DATA, MP2973_INVALID_DATA); __assign_bit(MP2973_INVALID_DATA, &ret, !(mask & PB_CML_FAULT_INVALID_DATA));
ret = SWAP(ret, mask, PB_CML_FAULT_INVALID_COMMAND, MP2973_INVALID_COMMAND); __assign_bit(MP2973_INVALID_COMMAND, &ret, !(mask & PB_CML_FAULT_INVALID_COMMAND));
ret = SWAP(ret, mask, PB_CML_FAULT_OTHER_COMM, MP2973_OTHER_COMM); __assign_bit(MP2973_OTHER_COMM, &ret, !(mask & PB_CML_FAULT_OTHER_COMM));
ret = SWAP(ret, mask, PB_CML_FAULT_PACKET_ERROR, MP2973_PACKET_ERROR); __assign_bit(MP2973_PACKET_ERROR, &ret, !(mask & PB_CML_FAULT_PACKET_ERROR));
break; break;
case PMBUS_STATUS_VOUT: case PMBUS_STATUS_VOUT:
ret = SWAP(ret, mask, PB_VOLTAGE_UV_FAULT, MP2973_VOLTAGE_UV); __assign_bit(MP2973_VOLTAGE_UV, &ret, !(mask & PB_VOLTAGE_UV_FAULT));
ret = SWAP(ret, mask, PB_VOLTAGE_OV_FAULT, MP2973_VOLTAGE_OV); __assign_bit(MP2973_VOLTAGE_OV, &ret, !(mask & PB_VOLTAGE_OV_FAULT));
break; break;
case PMBUS_STATUS_IOUT: case PMBUS_STATUS_IOUT:
ret = SWAP(ret, mask, PB_IOUT_OC_FAULT, MP2973_IOUT_OC); __assign_bit(MP2973_IOUT_OC, &ret, !(mask & PB_IOUT_OC_FAULT));
ret = SWAP(ret, mask, PB_IOUT_OC_LV_FAULT, MP2973_IOUT_OC_LV); __assign_bit(MP2973_IOUT_OC_LV, &ret, !(mask & PB_IOUT_OC_LV_FAULT));
break; break;
case PMBUS_STATUS_TEMPERATURE: case PMBUS_STATUS_TEMPERATURE:
ret = SWAP(ret, mask, PB_TEMP_OT_FAULT, MP2973_TEMP_OT); __assign_bit(MP2973_TEMP_OT, &ret, !(mask & PB_TEMP_OT_FAULT));
break; break;
/* /*
* Map remaining bits to MFR specific to let the PMBUS core mask * Map remaining bits to MFR specific to let the PMBUS core mask
* those bits by default. * those bits by default.
*/ */
case PMBUS_STATUS_MFR_SPECIFIC: case PMBUS_STATUS_MFR_SPECIFIC:
ret = SWAP(ret, mask, BIT(1), MP2973_VIN_UVLO); __assign_bit(MP2973_VIN_UVLO, &ret, !(mask & BIT(1)));
ret = SWAP(ret, mask, BIT(3), MP2973_VIN_OVP); __assign_bit(MP2973_VIN_OVP, &ret, !(mask & BIT(3)));
ret = SWAP(ret, mask, BIT(4), MP2973_MTP_FAULT); __assign_bit(MP2973_MTP_FAULT, &ret, !(mask & BIT(4)));
ret = SWAP(ret, mask, BIT(6), MP2973_MTP_BLK_TRIG); __assign_bit(MP2973_MTP_BLK_TRIG, &ret, !(mask & BIT(6)));
break; break;
default: default:
return 0; return 0;
} }
#undef SWAP
return pmbus_write_word_data(client, 0, PMBUS_SMBALERT_MASK, ret); return pmbus_write_word_data(client, 0, PMBUS_SMBALERT_MASK, ret);
} }