Skip to content

Commit c2e8134

Browse files
groeckgroeck
committed
hwmon: (ltc2992) Use HWMON_CHANNEL_INFO macro
The HWMON_CHANNEL_INFO macro simplifies the code, reduces the likelihood of errors, and makes the code easier to read. The conversion was done automatically with coccinelle. The semantic patch used to make this change is as follows. @s@ identifier i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @r@ initializer list elements; identifier s.i; @@ -u32 i[] = { - elements, - 0 -}; @script:ocaml t@ ty << s.ty; elements << r.elements; shorter; elems; @@ shorter := make_ident (List.hd(List.rev (Str.split (Str.regexp "_") ty))); elems := make_ident (String.concat "," (List.map (fun x -> Printf.sprintf "\n\t\t\t %s" x) (Str.split (Str.regexp " , ") elements))) @@ identifier s.j,t.shorter; identifier t.elems; @@ - &j + HWMON_CHANNEL_INFO(shorter,elems) This patch does not introduce functional changes. Many thanks to Julia Lawall for providing the coccinelle script. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent 6b767cc commit c2e8134

1 file changed

Lines changed: 25 additions & 61 deletions

File tree

‎drivers/hwmon/ltc2992.c‎

Lines changed: 25 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -811,68 +811,32 @@ static const struct hwmon_ops ltc2992_hwmon_ops = {
811811
.write = ltc2992_write,
812812
};
813813

814-
static const u32 ltc2992_chip_config[] = {
815-
HWMON_C_IN_RESET_HISTORY,
816-
0
817-
};
818-
819-
static const struct hwmon_channel_info ltc2992_chip = {
820-
.type = hwmon_chip,
821-
.config = ltc2992_chip_config,
822-
};
823-
824-
static const u32 ltc2992_in_config[] = {
825-
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX |
826-
HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM,
827-
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX |
828-
HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM,
829-
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX |
830-
HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM,
831-
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX |
832-
HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM,
833-
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX |
834-
HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM,
835-
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX |
836-
HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM,
837-
0
838-
};
839-
840-
static const struct hwmon_channel_info ltc2992_in = {
841-
.type = hwmon_in,
842-
.config = ltc2992_in_config,
843-
};
844-
845-
static const u32 ltc2992_curr_config[] = {
846-
HWMON_C_INPUT | HWMON_C_LOWEST | HWMON_C_HIGHEST | HWMON_C_MIN | HWMON_C_MAX |
847-
HWMON_C_MIN_ALARM | HWMON_C_MAX_ALARM,
848-
HWMON_C_INPUT | HWMON_C_LOWEST | HWMON_C_HIGHEST | HWMON_C_MIN | HWMON_C_MAX |
849-
HWMON_C_MIN_ALARM | HWMON_C_MAX_ALARM,
850-
0
851-
};
852-
853-
static const struct hwmon_channel_info ltc2992_curr = {
854-
.type = hwmon_curr,
855-
.config = ltc2992_curr_config,
856-
};
857-
858-
static const u32 ltc2992_power_config[] = {
859-
HWMON_P_INPUT | HWMON_P_INPUT_LOWEST | HWMON_P_INPUT_HIGHEST | HWMON_P_MIN | HWMON_P_MAX |
860-
HWMON_P_MIN_ALARM | HWMON_P_MAX_ALARM,
861-
HWMON_P_INPUT | HWMON_P_INPUT_LOWEST | HWMON_P_INPUT_HIGHEST | HWMON_P_MIN | HWMON_P_MAX |
862-
HWMON_P_MIN_ALARM | HWMON_P_MAX_ALARM,
863-
0
864-
};
865-
866-
static const struct hwmon_channel_info ltc2992_power = {
867-
.type = hwmon_power,
868-
.config = ltc2992_power_config,
869-
};
870-
871814
static const struct hwmon_channel_info *ltc2992_info[] = {
872-
&ltc2992_chip,
873-
&ltc2992_in,
874-
&ltc2992_curr,
875-
&ltc2992_power,
815+
HWMON_CHANNEL_INFO(chip,
816+
HWMON_C_IN_RESET_HISTORY),
817+
HWMON_CHANNEL_INFO(in,
818+
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN |
819+
HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM,
820+
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN |
821+
HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM,
822+
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN |
823+
HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM,
824+
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN |
825+
HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM,
826+
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN |
827+
HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM,
828+
HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN |
829+
HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM),
830+
HWMON_CHANNEL_INFO(curr,
831+
HWMON_C_INPUT | HWMON_C_LOWEST | HWMON_C_HIGHEST | HWMON_C_MIN |
832+
HWMON_C_MAX | HWMON_C_MIN_ALARM | HWMON_C_MAX_ALARM,
833+
HWMON_C_INPUT | HWMON_C_LOWEST | HWMON_C_HIGHEST | HWMON_C_MIN |
834+
HWMON_C_MAX | HWMON_C_MIN_ALARM | HWMON_C_MAX_ALARM),
835+
HWMON_CHANNEL_INFO(power,
836+
HWMON_P_INPUT | HWMON_P_INPUT_LOWEST | HWMON_P_INPUT_HIGHEST |
837+
HWMON_P_MIN | HWMON_P_MAX | HWMON_P_MIN_ALARM | HWMON_P_MAX_ALARM,
838+
HWMON_P_INPUT | HWMON_P_INPUT_LOWEST | HWMON_P_INPUT_HIGHEST |
839+
HWMON_P_MIN | HWMON_P_MAX | HWMON_P_MIN_ALARM | HWMON_P_MAX_ALARM),
876840
NULL
877841
};
878842

0 commit comments

Comments
 (0)