From patchwork Thu May 12 19:55:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 12848085 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 508ACC433F5 for ; Thu, 12 May 2022 19:56:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358265AbiELT4Q (ORCPT ); Thu, 12 May 2022 15:56:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358240AbiELT4E (ORCPT ); Thu, 12 May 2022 15:56:04 -0400 Received: from mail-oa1-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C44A13E8C for ; Thu, 12 May 2022 12:56:01 -0700 (PDT) Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-edf3b6b0f2so7962888fac.9 for ; Thu, 12 May 2022 12:56:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KhWipZGHRMPTklvBPnwbbUW4qSNdrLmj6cSLwIrhPI8=; b=J99aQDqyPBrwjruthl1Zzuzh1WsF8RzTkW6AWjgkE1hAGS6KQJBN2HEgMJdeTkNVM9 iYXqhanfklBY66oVQMIoCgBrm1RmIvcocYtOHS6LpjTldt06Y0KkZ0FAuL5+2phdYWid eDXfX9Q/r24nfnkwqs4udSbNfqEHilXzcfGBZc8+9j4qHdsGoMq8wMjaz/RdRY8/bL+Y njOIixWL01sC4lsqVS9BETJ1nv+0K8wYc9S9IFSCdciQRUXUmImtAGdAAz8HBGT0asTN CZyz7Aer85OHez9FCuRuKC4OKGvC/SiLDvjsN5/YuTXkxWiISgx5QH+4QvfpgQLqDQD8 OSJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=KhWipZGHRMPTklvBPnwbbUW4qSNdrLmj6cSLwIrhPI8=; b=WwCSvnoS5XK0IgYy4KSm7oY+svaHgq/wJygmeblMbEd+rc3qeOWyOCeH32S59hifZg Ck+1ytanPYsbDrIUPkJLIJJH9jTS//UL/AEZxqGozMwihJYfSi//aEArMAgSUtO85o3O qHAE/cQMvBSOgfR87kOgZgaLPdvPaTvuf634KtICfGqHlucKZ18lyZGB1b0os1RQ6Zyq Azp8l2PgU9cOkQyry/FMcPXuiZpBgx4s766wsypeGMtY+uORg3HAS5jpDnUh3MXVQAMC Zq4w1hspMzz2465tHTRL3G5c3ThJQcE+l+OOIRdyWSGh/QCD2XALYSHAcc/sCzntI8LI 5GKg== X-Gm-Message-State: AOAM530fnycc/Onvn/IGJgmWXQ/c9ExIMGNzhRHlHmySNcnnZt29GaMz xjl35rUJGzm+RwCkTE+npak8K44HEICjvQ== X-Google-Smtp-Source: ABdhPJyYgMB0hyBvVCIO3FtuV/0RKteXCvQMfhMtYEV7lo39ZU4DEyCgwy4lKRoZ7pZZjcEvDDMwzg== X-Received: by 2002:a05:6870:618e:b0:e5:c2f3:e009 with SMTP id a14-20020a056870618e00b000e5c2f3e009mr844104oah.10.1652385360625; Thu, 12 May 2022 12:56:00 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id e68-20020a9d2aca000000b006060322123bsm259970otb.11.2022.05.12.12.55.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 12:55:59 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 1/7] hwmon: (as370-hwmon) Use HWMON_CHANNEL_INFO macro Date: Thu, 12 May 2022 12:55:50 -0700 Message-Id: <20220512195556.137741-1-linux@roeck-us.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org 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 --- drivers/hwmon/as370-hwmon.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/hwmon/as370-hwmon.c b/drivers/hwmon/as370-hwmon.c index 464244ba8d58..63b5b2d6e593 100644 --- a/drivers/hwmon/as370-hwmon.c +++ b/drivers/hwmon/as370-hwmon.c @@ -76,18 +76,8 @@ as370_hwmon_is_visible(const void *data, enum hwmon_sensor_types type, } } -static const u32 as370_hwmon_temp_config[] = { - HWMON_T_INPUT, - 0 -}; - -static const struct hwmon_channel_info as370_hwmon_temp = { - .type = hwmon_temp, - .config = as370_hwmon_temp_config, -}; - static const struct hwmon_channel_info *as370_hwmon_info[] = { - &as370_hwmon_temp, + HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT), NULL }; From patchwork Thu May 12 19:55:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 12848086 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE281C433EF for ; Thu, 12 May 2022 19:56:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351922AbiELT4V (ORCPT ); Thu, 12 May 2022 15:56:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358241AbiELT4E (ORCPT ); Thu, 12 May 2022 15:56:04 -0400 Received: from mail-oa1-x2c.google.com (mail-oa1-x2c.google.com [IPv6:2001:4860:4864:20::2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 546ADBE11 for ; Thu, 12 May 2022 12:56:03 -0700 (PDT) Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-edf9ddb312so7973066fac.8 for ; Thu, 12 May 2022 12:56:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=76Mz/ejgcIn9Y1QSjLKixz/SQ6wftlnjP/a/JHUjETM=; b=RPuD65k9qRbJd3jBNYpSp14OUZIf1JA3q+Av/zabEbM/ORAtIfT37Kz5TBXTxQgAqu +7Y+T7BNrOs4nt2/BoVtKP4J6PIhIYQ9fpeJhuIgMEZPW1Wcr/5N8FL7Zd1oR1KwI2ff 3IMCn2Pl4K9OxzxvmrFgUbpEYyNPaLJJCduu4AX4HFBTaaETrSpa+oXAwzCBJ8ULqgfN Lzj+ldLkuFBoJLOGl5v06n3qbmsuCVYaRB+YmqoKG9/ldDS9LUB5bfA0Tcz4ebqQQmc3 1t1u4S0n67f+TqqU7zt6Q488tc3f14qS8eb/wYpoo1Te0C2ysqyD212/D5dmbVLX0Epp GYhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=76Mz/ejgcIn9Y1QSjLKixz/SQ6wftlnjP/a/JHUjETM=; b=gT2QMQSy/4TnUoMHXCu8MkcRDnt8AzGWlYIRbnizSGjDLdmTsVXdMEuOvIi/qlK/qq +gEf0C+aDaJ4O924CFrs5KMzOIRRFK457M9o6ta+Zafb863bA0PP3JIUNhMJBnS06oZn hShpijrLbs+e5vt2QUgOH7EttdXq63EYjX8b8HCGOBftJiAqNR8ElFZYg6ZEwAC/fM6Z e/OfOG8fkZcNYc/pdXRM3iKJxWMi5PscK22mlV3Gj+HEusNkwAZdB2t9LH4ODohcm2hO wg/urzEFzKJdDaKMOHxwoRQ63LlXpE2HihtYT62yBApFyNokg0g+cNxWZz0PHgYQCESv 9iQg== X-Gm-Message-State: AOAM533v9ClJ26MJ7btOwicFYjR/tXo8Rq7wR5SHV6aV1u9waJ+8LnsV 1IICJgCk8vzpITGibuditRMIiTUc2BNq5A== X-Google-Smtp-Source: ABdhPJzyHMfhzDGwumu75K+tmgJNZRGhMihtrzoZ9ubwIt3L5WhkQgTEP+X3qrwimA1tC/WOQeHr1Q== X-Received: by 2002:a05:6871:7a1:b0:ee:4c48:bfff with SMTP id o33-20020a05687107a100b000ee4c48bfffmr838847oap.118.1652385362444; Thu, 12 May 2022 12:56:02 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id h13-20020a4ab44d000000b0035eb4e5a6d1sm215795ooo.39.2022.05.12.12.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 12:56:01 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 2/7] hwmon: (ltc2992) Use HWMON_CHANNEL_INFO macro Date: Thu, 12 May 2022 12:55:51 -0700 Message-Id: <20220512195556.137741-2-linux@roeck-us.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220512195556.137741-1-linux@roeck-us.net> References: <20220512195556.137741-1-linux@roeck-us.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org 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 --- drivers/hwmon/ltc2992.c | 86 ++++++++++++----------------------------- 1 file changed, 25 insertions(+), 61 deletions(-) diff --git a/drivers/hwmon/ltc2992.c b/drivers/hwmon/ltc2992.c index 7352d2b3c756..72489d5d7eaf 100644 --- a/drivers/hwmon/ltc2992.c +++ b/drivers/hwmon/ltc2992.c @@ -811,68 +811,32 @@ static const struct hwmon_ops ltc2992_hwmon_ops = { .write = ltc2992_write, }; -static const u32 ltc2992_chip_config[] = { - HWMON_C_IN_RESET_HISTORY, - 0 -}; - -static const struct hwmon_channel_info ltc2992_chip = { - .type = hwmon_chip, - .config = ltc2992_chip_config, -}; - -static const u32 ltc2992_in_config[] = { - HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX | - HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM, - HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX | - HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM, - HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX | - HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM, - HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX | - HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM, - HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX | - HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM, - HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | HWMON_I_MAX | - HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM, - 0 -}; - -static const struct hwmon_channel_info ltc2992_in = { - .type = hwmon_in, - .config = ltc2992_in_config, -}; - -static const u32 ltc2992_curr_config[] = { - HWMON_C_INPUT | HWMON_C_LOWEST | HWMON_C_HIGHEST | HWMON_C_MIN | HWMON_C_MAX | - HWMON_C_MIN_ALARM | HWMON_C_MAX_ALARM, - HWMON_C_INPUT | HWMON_C_LOWEST | HWMON_C_HIGHEST | HWMON_C_MIN | HWMON_C_MAX | - HWMON_C_MIN_ALARM | HWMON_C_MAX_ALARM, - 0 -}; - -static const struct hwmon_channel_info ltc2992_curr = { - .type = hwmon_curr, - .config = ltc2992_curr_config, -}; - -static const u32 ltc2992_power_config[] = { - HWMON_P_INPUT | HWMON_P_INPUT_LOWEST | HWMON_P_INPUT_HIGHEST | HWMON_P_MIN | HWMON_P_MAX | - HWMON_P_MIN_ALARM | HWMON_P_MAX_ALARM, - HWMON_P_INPUT | HWMON_P_INPUT_LOWEST | HWMON_P_INPUT_HIGHEST | HWMON_P_MIN | HWMON_P_MAX | - HWMON_P_MIN_ALARM | HWMON_P_MAX_ALARM, - 0 -}; - -static const struct hwmon_channel_info ltc2992_power = { - .type = hwmon_power, - .config = ltc2992_power_config, -}; - static const struct hwmon_channel_info *ltc2992_info[] = { - <c2992_chip, - <c2992_in, - <c2992_curr, - <c2992_power, + HWMON_CHANNEL_INFO(chip, + HWMON_C_IN_RESET_HISTORY), + HWMON_CHANNEL_INFO(in, + HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | + HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM, + HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | + HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM, + HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | + HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM, + HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | + HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM, + HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | + HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM, + HWMON_I_INPUT | HWMON_I_LOWEST | HWMON_I_HIGHEST | HWMON_I_MIN | + HWMON_I_MAX | HWMON_I_MIN_ALARM | HWMON_I_MAX_ALARM), + HWMON_CHANNEL_INFO(curr, + HWMON_C_INPUT | HWMON_C_LOWEST | HWMON_C_HIGHEST | HWMON_C_MIN | + HWMON_C_MAX | HWMON_C_MIN_ALARM | HWMON_C_MAX_ALARM, + HWMON_C_INPUT | HWMON_C_LOWEST | HWMON_C_HIGHEST | HWMON_C_MIN | + HWMON_C_MAX | HWMON_C_MIN_ALARM | HWMON_C_MAX_ALARM), + HWMON_CHANNEL_INFO(power, + HWMON_P_INPUT | HWMON_P_INPUT_LOWEST | HWMON_P_INPUT_HIGHEST | + HWMON_P_MIN | HWMON_P_MAX | HWMON_P_MIN_ALARM | HWMON_P_MAX_ALARM, + HWMON_P_INPUT | HWMON_P_INPUT_LOWEST | HWMON_P_INPUT_HIGHEST | + HWMON_P_MIN | HWMON_P_MAX | HWMON_P_MIN_ALARM | HWMON_P_MAX_ALARM), NULL }; From patchwork Thu May 12 19:55:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 12848087 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 081D5C433FE for ; Thu, 12 May 2022 19:56:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358226AbiELT4W (ORCPT ); Thu, 12 May 2022 15:56:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358243AbiELT4G (ORCPT ); Thu, 12 May 2022 15:56:06 -0400 Received: from mail-oo1-xc2e.google.com (mail-oo1-xc2e.google.com [IPv6:2607:f8b0:4864:20::c2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B9BF140BC for ; Thu, 12 May 2022 12:56:05 -0700 (PDT) Received: by mail-oo1-xc2e.google.com with SMTP id a23-20020a4ad5d7000000b0035ee70da7a9so2374576oot.1 for ; Thu, 12 May 2022 12:56:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jkkA68rw8RtU0yfUmCNXyoAoEbWNcmBb9A16ou7NvdE=; b=KBUGmLPWGSr5yz9npIOM11DpBHTNrzvgIjM0Odi4gFiXhz1An9J8/OZTPfvd1+lh/u vkI1t8g9LNew69nf4sDnlL6SYBQsMDvszDdWYVYjWAqoZeAo/TIKeodxsYvyxl0Ie9oA jvwD8WE831ZKfzp2FDFsPCB9seki4gTXyw7ybiXkroqpfRDnvnIyicyOMBZSEqEV0dDc 9u6olgZ78DX4oKcUMi+IbuOVcgClY3oSZsj6FXwH68fzEKiSTVr2abtLO4553Nftsarp rAJFPDmHX/7jOipt08uG2T4x92nEqnksKvJOyDNJ33w4h4f/5g/QMAUm6LS5SSCz5+EL cfaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jkkA68rw8RtU0yfUmCNXyoAoEbWNcmBb9A16ou7NvdE=; b=QKi3B/8eqKGeQCDtWNQ7DIeRXYvN5fGjU6AWjEIfN7qeQT+Eh5QjPK7zdVVH1basnt 1XHuo9cYK2+bcUGYIaEeqaDqtt3dS9vDNd7PMuHQ42unnMF2DojXZ9d98UwzmsgoQMuS gygNax6JbtVW/91+D5en7ODBYwajEtTt5d4L3aS0PycLcuFAyV3KvFZkBilvxgGvZ11J MFwzk+h73B4vYZ/uqL3CqUr9uG/goB1WBZBdc56ugtKJP2CrWkW1ZRY86zx9JhR9SPDd O65gZyVhlL7hXMzw1l1JMUnEOzrbOZ3dUgd5mq0caFNoqFW5b+k/0bBl5iCSjV8PNvJs 7VWw== X-Gm-Message-State: AOAM5307JOoo8Pff+kXO8LzgI5E0I/3R/+4+a8hx8CQPB070Zww7jMof Lu/QgGtYnUiNqFyIc0ld8QuVx9xA1uGWhg== X-Google-Smtp-Source: ABdhPJxXfnfj/88EwQw6uJX5oN5dYOCykc8odwnEDvvF6jFBSKZo8j8Ai2ocmCGEO1Y0TFcGAyT33A== X-Received: by 2002:a05:6820:1517:b0:35f:5a69:8cc0 with SMTP id ay23-20020a056820151700b0035f5a698cc0mr687038oob.72.1652385364275; Thu, 12 May 2022 12:56:04 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id j26-20020a9d739a000000b006060322127bsm235685otk.75.2022.05.12.12.56.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 12:56:03 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck , Philipp Zabel Subject: [PATCH 3/7] hwmon: (mr75203) Use HWMON_CHANNEL_INFO macro Date: Thu, 12 May 2022 12:55:52 -0700 Message-Id: <20220512195556.137741-3-linux@roeck-us.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220512195556.137741-1-linux@roeck-us.net> References: <20220512195556.137741-1-linux@roeck-us.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org 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. Cc: Philipp Zabel Signed-off-by: Guenter Roeck --- drivers/hwmon/mr75203.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/hwmon/mr75203.c b/drivers/hwmon/mr75203.c index 1ba1e3145969..26278b0f17a9 100644 --- a/drivers/hwmon/mr75203.c +++ b/drivers/hwmon/mr75203.c @@ -223,16 +223,6 @@ static int pvt_read(struct device *dev, enum hwmon_sensor_types type, } } -static const u32 pvt_chip_config[] = { - HWMON_C_REGISTER_TZ, - 0 -}; - -static const struct hwmon_channel_info pvt_chip = { - .type = hwmon_chip, - .config = pvt_chip_config, -}; - static struct hwmon_channel_info pvt_temp = { .type = hwmon_temp, }; @@ -555,7 +545,7 @@ static int mr75203_probe(struct platform_device *pdev) pvt_info = devm_kcalloc(dev, val + 2, sizeof(*pvt_info), GFP_KERNEL); if (!pvt_info) return -ENOMEM; - pvt_info[0] = &pvt_chip; + pvt_info[0] = HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ); index = 1; if (ts_num) { From patchwork Thu May 12 19:55:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 12848088 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 964EDC4332F for ; Thu, 12 May 2022 19:56:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358228AbiELT4W (ORCPT ); Thu, 12 May 2022 15:56:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358244AbiELT4I (ORCPT ); Thu, 12 May 2022 15:56:08 -0400 Received: from mail-oa1-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07D6B165BC for ; Thu, 12 May 2022 12:56:07 -0700 (PDT) Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-e5e433d66dso7991017fac.5 for ; Thu, 12 May 2022 12:56:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m4jaZv1sZFD3YYDa2z5L2zXbgYH6xsnqLEaLXVHLkLY=; b=PUANveeiWwP6vpWCaTpTMltkrl/hjsr7mbAgwmO6letZZYFCFYoxii+FTa3njhUQSL HZSn15QNqfIfbE4uyonQY9HJRj5QmAgdSPZCNiYdr6nOKzVpgA86zS/SQB7AovoNtOyz xiIe8iRVGRmW4Ow7raLnPDyq1T7SYpv8adzVSqdFa/HJNlpYcMreynu5DFcwo6iVt6tA QhvsmqtM0H1hBKhLS58GGFo8lu1tozNcL2ohrhOlO1xS9wPvQIt2xUrxWLySOKhN7yql dUqgzPa6XjXFYODKdjOc1h2Vhhk5YrpFAmoXkNeZJR/o6Ta7XJDqFWSjo/5DeUjomYSs OxRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=m4jaZv1sZFD3YYDa2z5L2zXbgYH6xsnqLEaLXVHLkLY=; b=6Jicd8O0Mkz67OncF1JtUqLw2SSv8enHHRnthCc8T5rZgIT1sxl39CQiMguwWChxi7 lCY6NN1uSEy+C7GPvRHh7+UGenvJk4V+NoFKgaAZRcwbZjfYr4eR1rfTJ94MMmEy5CRQ Gjk5i3ZbOLJvwdLrIaLbxb+0UyTOihafuex+iXileOK5p4Kk4uHWRuxOXiSQ33GgnyTT cyAVoQgqR4iblNOl6/SOmjPUh8rF3wLkh7Js7JNK7d8v29Io+wyP68gvdGea2AcHsBAu mb9b46QtZ50J5Q9ZtvmdPvNgeIQi1SdgomNb1Y48Qy41/+DcS5Wnx8Nzhui0kX9DSyUy 4Mvg== X-Gm-Message-State: AOAM5337BHyqnOUKa5Ciug4jutQ/z9HkCjhZih6dIS3Nt4phdQPIGhS4 EM9MFzYlmd84TtWYdLFfuZrcXzc6AIlhZA== X-Google-Smtp-Source: ABdhPJweM/6AGmxBJveyDP6H9HDZ+fTcG/FkyUHxPesSDiiLrAitYtPrqrho0WChNPF+JJkl5lbGsw== X-Received: by 2002:a05:6870:a70e:b0:da:31c6:1d20 with SMTP id g14-20020a056870a70e00b000da31c61d20mr827210oam.86.1652385366155; Thu, 12 May 2022 12:56:06 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id b14-20020a056870160e00b000e686d13891sm146140oae.43.2022.05.12.12.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 12:56:05 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck , Iwona Winiarska Subject: [PATCH 4/7] hwmon: (peci/cputemp) Use HWMON_CHANNEL_INFO macro Date: Thu, 12 May 2022 12:55:53 -0700 Message-Id: <20220512195556.137741-4-linux@roeck-us.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220512195556.137741-1-linux@roeck-us.net> References: <20220512195556.137741-1-linux@roeck-us.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org 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. Cc: Iwona Winiarska Signed-off-by: Guenter Roeck Reviewed-by: Iwona Winiarska --- drivers/hwmon/peci/cputemp.c | 38 +++++++++++++++--------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/drivers/hwmon/peci/cputemp.c b/drivers/hwmon/peci/cputemp.c index 12156328f5cf..57470fda5f6c 100644 --- a/drivers/hwmon/peci/cputemp.c +++ b/drivers/hwmon/peci/cputemp.c @@ -447,29 +447,23 @@ static const struct hwmon_ops peci_cputemp_ops = { .read = cputemp_read, }; -static const u32 peci_cputemp_temp_channel_config[] = { - /* Die temperature */ - HWMON_T_LABEL | HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT | HWMON_T_CRIT_HYST, - /* DTS margin */ - HWMON_T_LABEL | HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT | HWMON_T_CRIT_HYST, - /* Tcontrol temperature */ - HWMON_T_LABEL | HWMON_T_INPUT | HWMON_T_CRIT, - /* Tthrottle temperature */ - HWMON_T_LABEL | HWMON_T_INPUT, - /* Tjmax temperature */ - HWMON_T_LABEL | HWMON_T_INPUT, - /* Core temperature - for all core channels */ - [channel_core ... CPUTEMP_CHANNEL_NUMS - 1] = HWMON_T_LABEL | HWMON_T_INPUT, - 0 -}; - -static const struct hwmon_channel_info peci_cputemp_temp_channel = { - .type = hwmon_temp, - .config = peci_cputemp_temp_channel_config, -}; - static const struct hwmon_channel_info *peci_cputemp_info[] = { - &peci_cputemp_temp_channel, + HWMON_CHANNEL_INFO(temp, + /* Die temperature */ + HWMON_T_LABEL | HWMON_T_INPUT | HWMON_T_MAX | + HWMON_T_CRIT | HWMON_T_CRIT_HYST, + /* DTS margin */ + HWMON_T_LABEL | HWMON_T_INPUT | HWMON_T_MAX | + HWMON_T_CRIT | HWMON_T_CRIT_HYST, + /* Tcontrol temperature */ + HWMON_T_LABEL | HWMON_T_INPUT | HWMON_T_CRIT, + /* Tthrottle temperature */ + HWMON_T_LABEL | HWMON_T_INPUT, + /* Tjmax temperature */ + HWMON_T_LABEL | HWMON_T_INPUT, + /* Core temperature - for all core channels */ + [channel_core ... CPUTEMP_CHANNEL_NUMS - 1] = + HWMON_T_LABEL | HWMON_T_INPUT), NULL }; From patchwork Thu May 12 19:55:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 12848089 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88910C433EF for ; Thu, 12 May 2022 19:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358229AbiELT4X (ORCPT ); Thu, 12 May 2022 15:56:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358245AbiELT4J (ORCPT ); Thu, 12 May 2022 15:56:09 -0400 Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCBA7140BC for ; Thu, 12 May 2022 12:56:08 -0700 (PDT) Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-ed8a3962f8so7990182fac.4 for ; Thu, 12 May 2022 12:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cd+h87gX/veAFTDZHlQQNLwWHMU8bPEDP+4w2pLzdMY=; b=RBKMQmeNrhQPIOWV/OfxJnKQRdqFcf8eABu0dwOy6Xi8o8EZLwyH4K/kUqrVTEJweY mUOzYEqxdYvQncGKstpfWUZtdfUBuCbK4Q+6U/IA+OTtAXr0q1HsqJ3mvZdh6T6xc/58 K3cOVSURG+NPu1TPpKUsy8LclNB2JDVAq9OmCWvpIg0EuaMWW2KlgwSO9/czFIP+hxWj LIimgdLZQqLOqwm4/O0+PAEiqWs7oULdnyCVZoVZSb49bg44q0ZCUZlQfaEhkE21kSMM BZl9WGrx4eZe/XjzS2JrA6Gy8zvec6SASf3Is82QHU1rbbhhSaSb8lAe59fYJLLq5u60 ChSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cd+h87gX/veAFTDZHlQQNLwWHMU8bPEDP+4w2pLzdMY=; b=SaqVnZvJMHDklA3K77oac4XpYcNZISqkblDtBSgLrrI+COHtYy3pbJybnHevzfRWYK ooE8shiVcAOTLWL30x0hPJVxL4hJ5poZkZH2o2J5w9fJiih+b/P5hb5LYem7LBPxKX3K n1GWWqK7gYQEB2/uq3wCtAJpmmN3Es6lNjo+uMrynUTsKCov7RcqI0Gz14tBCczperLe p+qGTXsZMVo/GuuS4Tw4+/hq1CnLxmZPXBehF81VLr4/LOYxTjciBnGaM8hcKZDs8Bfy LSZm5fZfTUw2RZAbdkW6GTV1mZT4z6FMMjxa+cYwj5T2EfxfO2wCaVoXNnvK30Ronn70 bRhQ== X-Gm-Message-State: AOAM533c9tvCBRxA+N/WgY+SlpDpjnmddWc3Toj/IM7WAgRwzvG3xQqW s5YFLGFf+LiXYqwEsMoF2SQXmRWnmvXmWg== X-Google-Smtp-Source: ABdhPJxi08YnPVMLvXr1ow0i6hz9Uvu80qsVfuzn5L15gMuMvSBYcH2xqdmBJwOjBbJRR+VMULCKsw== X-Received: by 2002:a05:6870:418a:b0:e9:75e:1d80 with SMTP id y10-20020a056870418a00b000e9075e1d80mr820263oac.66.1652385367921; Thu, 12 May 2022 12:56:07 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id f137-20020a4a588f000000b0035eb4e5a6d3sm217223oob.41.2022.05.12.12.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 12:56:07 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck , Iwona Winiarska Subject: [PATCH 5/7] hwmon: (peci/dimmtemp) Use HWMON_CHANNEL_INFO macro Date: Thu, 12 May 2022 12:55:54 -0700 Message-Id: <20220512195556.137741-5-linux@roeck-us.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220512195556.137741-1-linux@roeck-us.net> References: <20220512195556.137741-1-linux@roeck-us.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org 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. Cc: Iwona Winiarska Signed-off-by: Guenter Roeck Reviewed-by: Iwona Winiarska --- drivers/hwmon/peci/dimmtemp.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/hwmon/peci/dimmtemp.c b/drivers/hwmon/peci/dimmtemp.c index 96b9919db357..3c71b5546bcb 100644 --- a/drivers/hwmon/peci/dimmtemp.c +++ b/drivers/hwmon/peci/dimmtemp.c @@ -300,18 +300,10 @@ static int create_dimm_temp_label(struct peci_dimmtemp *priv, int chan) return 0; } -static const u32 peci_dimmtemp_temp_channel_config[] = { - [0 ... DIMM_NUMS_MAX - 1] = HWMON_T_LABEL | HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT, - 0 -}; - -static const struct hwmon_channel_info peci_dimmtemp_temp_channel = { - .type = hwmon_temp, - .config = peci_dimmtemp_temp_channel_config, -}; - static const struct hwmon_channel_info *peci_dimmtemp_temp_info[] = { - &peci_dimmtemp_temp_channel, + HWMON_CHANNEL_INFO(temp, + [0 ... DIMM_NUMS_MAX - 1] = HWMON_T_LABEL | + HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT), NULL }; From patchwork Thu May 12 19:55:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 12848090 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C95E5C433F5 for ; Thu, 12 May 2022 19:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358230AbiELT4Y (ORCPT ); Thu, 12 May 2022 15:56:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358247AbiELT4L (ORCPT ); Thu, 12 May 2022 15:56:11 -0400 Received: from mail-oa1-x2c.google.com (mail-oa1-x2c.google.com [IPv6:2001:4860:4864:20::2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60575140BC for ; Thu, 12 May 2022 12:56:10 -0700 (PDT) Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-edf9ddb312so7973066fac.8 for ; Thu, 12 May 2022 12:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lrGx3pMFJSZbjzB8D4KbDqkq3EwlgJL/3V4Bwp1quSM=; b=IfSWOPdtRS4AhpluvDtsDImVuoTDSeuKSxDBeJT6IouN2f+Qi/CuUW58yJo6KIe3rT +0yC+eyEsXoJW1fB8RV6z/XmKIsX6PZQTHDR3WLdW/RuyJM3dSONJEYOzTuCaW+Wo2Iw ZsVHanj8t15W3/e/Nj0ViTjsx16P/bXRO5q8o+Qom6BDOjDZCfqotNGCVZtslHDaV0cl OcLn2n+14+1IYG4FfRpXU90BclinIAmtSzfsuEIJAXQq6rbd9mg9sMW4juuABKRKx0el 1/M4/zIvGEZpb/D9cCoxlWfBiQiP9kmEMbN+gq1cyZ/dhy31qT48h+CZ6YiZ6L4ahnZd MtBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lrGx3pMFJSZbjzB8D4KbDqkq3EwlgJL/3V4Bwp1quSM=; b=SdG7fAr0KlxCwpwavJ6tY1qf2++at/1qLU6VuJV6Y0cPRr9GST0lRnxJxkfhe/N3ib GGfmbQ5RxMM6f3fauW6rZFvtkaK2z5ZljitOKv0LGchg5XG1ouW6CWCwM2FH3HQnB1Iz OLPuAVhGqU/6Gf9sff/5w16LpqHrDHUGD83N5/zFzdUVOjzNG+KT4QpxBYOJI0Fk87Zo 8Z63fQVYW2IQj6jTrZF4OVRe0iISnazZ+xmgccv6DjgszuPsgdyo88lxcPAJlO/YvJP5 gkuA+Mo6kEm5RU8JOItQyu8T3N7MurLKYaWp2w8qWGNjrgAOvVppxdgeSyw45OyGVnPW l4+A== X-Gm-Message-State: AOAM533L0cOIJL1EouQt+cY199Y6TVsx5MNSgvt5jdRex44dDntTbyp4 CMkpjcNj/qxUCqSSw1TN62gGMkchMsSSeg== X-Google-Smtp-Source: ABdhPJxLnF1icrPWUQBUzcjEsA1dzS9COHyztFHJnHcC+IRU45RmevEExjzcbpU97sCuyr1VsUGcdA== X-Received: by 2002:a05:6870:3c1b:b0:ee:1585:7a58 with SMTP id gk27-20020a0568703c1b00b000ee15857a58mr6704266oab.110.1652385369815; Thu, 12 May 2022 12:56:09 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id o184-20020aca5ac1000000b00328abf1e309sm292425oib.23.2022.05.12.12.56.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 12:56:09 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 6/7] hwmon: (pwm-fan) Use HWMON_CHANNEL_INFO macro Date: Thu, 12 May 2022 12:55:55 -0700 Message-Id: <20220512195556.137741-6-linux@roeck-us.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220512195556.137741-1-linux@roeck-us.net> References: <20220512195556.137741-1-linux@roeck-us.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org 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 --- drivers/hwmon/pwm-fan.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index f12b9a28a232..6c08551d8d14 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -49,16 +49,6 @@ struct pwm_fan_ctx { struct hwmon_channel_info fan_channel; }; -static const u32 pwm_fan_channel_config_pwm[] = { - HWMON_PWM_INPUT, - 0 -}; - -static const struct hwmon_channel_info pwm_fan_channel_pwm = { - .type = hwmon_pwm, - .config = pwm_fan_channel_config_pwm, -}; - /* This handler assumes self resetting edge triggered interrupt. */ static irqreturn_t pulse_handler(int irq, void *dev_id) { @@ -387,7 +377,7 @@ static int pwm_fan_probe(struct platform_device *pdev) if (!channels) return -ENOMEM; - channels[0] = &pwm_fan_channel_pwm; + channels[0] = HWMON_CHANNEL_INFO(pwm, HWMON_PWM_INPUT); for (i = 0; i < ctx->tach_count; i++) { struct pwm_fan_tach *tach = &ctx->tachs[i]; From patchwork Thu May 12 19:55:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 12848091 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D073BC4332F for ; Thu, 12 May 2022 19:56:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358239AbiELT4Y (ORCPT ); Thu, 12 May 2022 15:56:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358251AbiELT4O (ORCPT ); Thu, 12 May 2022 15:56:14 -0400 Received: from mail-oa1-x2d.google.com (mail-oa1-x2d.google.com [IPv6:2001:4860:4864:20::2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE5981838C for ; Thu, 12 May 2022 12:56:12 -0700 (PDT) Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-d6e29fb3d7so7981000fac.7 for ; Thu, 12 May 2022 12:56:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Owt6xWxjB7Gtk/Vy9gNjbL2TPJqjW6vw571EvSRoBSA=; b=mJNiABkaBN0B93fBtOZQxxfl0+CSVujkZcQdOO6j+Z8wQGgU6nezLBGvHQzYL3j6Hk 5eMXEJV8Gz/ukX3L6waa0UJx3Hl6/j0YriXbB2Oy1JDKLrmk/0v0BT5+/JyF07vdv7ms L7xZdgquW0K+bYPGqtrjITMsRUyv75l4ROIjFks5dPYo+oylzR0am6EaTAjGmJTDuT8b v8l/ewmFUJQx1W8cC4NPjcQ9t57++e5crGYuM9pDHAL/K76uYfEwIzaslyfSGWcK7fKW iGqZeM01WRO4gFa4GA7hmJLfVCOfWYuKoeGvvKC1KKHsiVmvR27ANekI38wfR8TNNf1K omPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Owt6xWxjB7Gtk/Vy9gNjbL2TPJqjW6vw571EvSRoBSA=; b=JyuMz543lUg4UTmJXD/46x6aqxMGg4dBbt7Q9X5WwwAJKcFagde2ZKTsyM+MBh3u6D n2LJ9RWzqaFcwQNLmsLqmi5IQF/D/bAfZfvHJjuSoQkDoC0A7BmPvTfsTj7E2WTkNlf1 kUmN1veG9Y8cBuFlVrQjdxlg3UtCvN5pn4jfaOQQxdSJyirNz3lwvz/R5kdOiV1LhchN a12cET+LpeYeZqaIJik+Sbv4zDiDaNswhGh/xKN1CgWGC5Th6WbtcxzAFw9KOA4MUlUX EyU3k1FkHwKNiLuYge5XXSzJ3/fbSmB5FXdtHGfxF0gU8X2YoX8rUcJzzL+Ab4gtZdBC Vk/Q== X-Gm-Message-State: AOAM531CT4qGaXzmxFhBPiez5OxHlKvjihCKYfAnaekOBy+JKlv2d1om S5k13BQXyYiox/oCDEFBzEjnemTgCHsffw== X-Google-Smtp-Source: ABdhPJzw8P3WLy52ZqpW8PfSheYoko7P9Nho0w9NGcqC0CoSISsXHoRU7AU3A0Qt95BGCQaTfJOkhg== X-Received: by 2002:a05:6870:524f:b0:ed:824:4238 with SMTP id o15-20020a056870524f00b000ed08244238mr792374oai.113.1652385371690; Thu, 12 May 2022 12:56:11 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id w15-20020a056830144f00b00606a6c09a0csm243100otp.12.2022.05.12.12.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 12:56:11 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck , Michael Walle Subject: [PATCH 7/7] hwmon: (sl28cpld-hwmon) Use HWMON_CHANNEL_INFO macro Date: Thu, 12 May 2022 12:55:56 -0700 Message-Id: <20220512195556.137741-7-linux@roeck-us.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220512195556.137741-1-linux@roeck-us.net> References: <20220512195556.137741-1-linux@roeck-us.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org 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. Cc: Michael Walle Signed-off-by: Guenter Roeck --- drivers/hwmon/sl28cpld-hwmon.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/hwmon/sl28cpld-hwmon.c b/drivers/hwmon/sl28cpld-hwmon.c index e48f58ec5b9c..e2fc60bf40bd 100644 --- a/drivers/hwmon/sl28cpld-hwmon.c +++ b/drivers/hwmon/sl28cpld-hwmon.c @@ -67,18 +67,8 @@ static int sl28cpld_hwmon_read(struct device *dev, return 0; } -static const u32 sl28cpld_hwmon_fan_config[] = { - HWMON_F_INPUT, - 0 -}; - -static const struct hwmon_channel_info sl28cpld_hwmon_fan = { - .type = hwmon_fan, - .config = sl28cpld_hwmon_fan_config, -}; - static const struct hwmon_channel_info *sl28cpld_hwmon_info[] = { - &sl28cpld_hwmon_fan, + HWMON_CHANNEL_INFO(fan, HWMON_F_INPUT), NULL };