From patchwork Mon Apr 1 16:19:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880225 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D80AC13B5 for ; Mon, 1 Apr 2019 16:19:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C395F26E16 for ; Mon, 1 Apr 2019 16:19:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7A5F26E4F; Mon, 1 Apr 2019 16:19:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 523B126E16 for ; Mon, 1 Apr 2019 16:19:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728196AbfDAQTq (ORCPT ); Mon, 1 Apr 2019 12:19:46 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:42894 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726854AbfDAQTp (ORCPT ); Mon, 1 Apr 2019 12:19:45 -0400 Received: by mail-pf1-f194.google.com with SMTP id r15so4805963pfn.9 for ; Mon, 01 Apr 2019 09:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=OWPZ9YldeUjXP3Qqs99sSZQ8OCpet5I0el3vEDSr++A=; b=nVKp1KH8gWZc88dL6O/TIippbUluNYlmKIqkVyuSJj+2JAv/NN+4UhLXMakofGcu19 x3iiqrlWlxMkBAiPoBCfK3zUv0sQkXJQsBBVZ/S7ZGZybEn7/LHYI4zsEimOLi7tf7tX JhahGCzxhDi3ThioWU/ok4q3sWCzeP5Ws4WL+2k48LM5UVIt+rTJiVMco0EHW1GIhLnU 2ofcJQ1oMvjWSZYCXFgL2iXlQuGFCOmzOBc3lXoeVmLUCI0jCBkiyFPL5kv5C7LVasTH qQ5l63n8McI9pw8e+fMsDNtCKjmJWY+0cpBAQReiDDqjzzmy2KT7vBFyAw3E6vNKpYuI vroA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=OWPZ9YldeUjXP3Qqs99sSZQ8OCpet5I0el3vEDSr++A=; b=b7ufDNjDfb688bCbAfqusDwExiQqFEg6UlrELFs01FGJDqvpPXMQXS4YuT8OGXy2M1 dSWgfZ+atHGLt+FA86YGwrp1doGL4NWiBZONJG0VXeCI5ZJCyP/d0AistECm8HnX9wj7 IJkVyiRtHWJz/tknO/jpyprH7QjaGsCmJNG8hhDYv298Oj/YP/pOme06MlKH6TVehRf1 eciHJWcUMALKOTTXis4olGvvkuCSLuL8PziB0RlEKC5UTb44Y3oykdcKD06fQTEfBX6t ILSgSJbkxCtvUVWiyRT5wGr/p2RVlXOi4nzNkFFo4+mYuqO1Y4k6MUdbWa0e8R+mPDgP EdDA== X-Gm-Message-State: APjAAAUaTuD/ck24HeJSI3JLZgPnYc0zrIBBowmozrgNnuW24z/s7Ha3 5m1lCc2oWjONduNE89KQ3t3I4kEa X-Google-Smtp-Source: APXvYqysdxdVX/iLThpd6FVUl40MNZWMeXUO5Ua9eyllryehsow5KQe01eNjHNkJm4umVRD1ZemUTw== X-Received: by 2002:aa7:91d5:: with SMTP id z21mr32018159pfa.222.1554135584605; Mon, 01 Apr 2019 09:19:44 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id t8sm13318850pgp.5.2019.04.01.09.19.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:19:44 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 01/17] hwmon: (adt7411) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:21 -0700 Message-Id: <1554135577-11889-2-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/adt7411.c | 48 +++++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c index b939f8a115ba..44a827b031cb 100644 --- a/drivers/hwmon/adt7411.c +++ b/drivers/hwmon/adt7411.c @@ -639,40 +639,22 @@ static int adt7411_init_device(struct adt7411_data *data) return i2c_smbus_write_byte_data(data->client, ADT7411_REG_CFG1, val); } -static const u32 adt7411_in_config[] = { - HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, - HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, - HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, - HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, - HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, - HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, - HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, - HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, - HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, - 0 -}; - -static const struct hwmon_channel_info adt7411_in = { - .type = hwmon_in, - .config = adt7411_in_config, -}; - -static const u32 adt7411_temp_config[] = { - HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM | - HWMON_T_MAX | HWMON_T_MAX_ALARM, - HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM | - HWMON_T_MAX | HWMON_T_MAX_ALARM | HWMON_T_FAULT, - 0 -}; - -static const struct hwmon_channel_info adt7411_temp = { - .type = hwmon_temp, - .config = adt7411_temp_config, -}; - static const struct hwmon_channel_info *adt7411_info[] = { - &adt7411_in, - &adt7411_temp, + HWMON_CHANNEL_INFO(in, + HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, + HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, + HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, + HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, + HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, + HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, + HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, + HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM, + HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_MAX | HWMON_I_ALARM), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM | + HWMON_T_MAX | HWMON_T_MAX_ALARM, + HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MIN_ALARM | + HWMON_T_MAX | HWMON_T_MAX_ALARM | HWMON_T_FAULT), NULL }; From patchwork Mon Apr 1 16:19:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880227 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E3E8B13B5 for ; Mon, 1 Apr 2019 16:19:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE1F126E3C for ; Mon, 1 Apr 2019 16:19:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2ADC27E01; Mon, 1 Apr 2019 16:19:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61E0B26E3C for ; Mon, 1 Apr 2019 16:19:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728040AbfDAQTr (ORCPT ); Mon, 1 Apr 2019 12:19:47 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:45252 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726854AbfDAQTr (ORCPT ); Mon, 1 Apr 2019 12:19:47 -0400 Received: by mail-pl1-f196.google.com with SMTP id bf11so4717479plb.12 for ; Mon, 01 Apr 2019 09:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=HVSjMgBoBsW0LOLJ2AYKLM/rECzLmsodXYvRx06vPR8=; b=CapYEWDEv22nk+vcXT+muEqqf3K4bggxLKaD9G0+RI1KHHcvu24p0trKnC/iJZFeDM 15vINimDtbhEESBNhHgoxbojAZRdy+THWVKucFPpsNUY8UkWbzhLFzd8wjWO9ErncecI jTUEO4millRld2XiBTumRe7fB0DXLmGQeG+gtl+QhMcaLAUQ7///7VJwPTNK3kj7A9VD /UslPe6dbAjmvo4nmIO/u8Q9d+7etto1cy+RFnfUVwnZ7gsd26ziXL5IJDbROqa/ACJv Zr7v90wsM/qsfsneAhoLFb7GsE8R5PSQ9h76l/AvPQV+WZg/QrNupqFm9G7cbNz4sVVk G7eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=HVSjMgBoBsW0LOLJ2AYKLM/rECzLmsodXYvRx06vPR8=; b=UBqHJHYn0RIvBwiSiqz5ysYCXI2pyqGeeAkNOljRyIV6q33u846FvB84PgHKhZniZI 6LHKkTFZQR6b2xAZSYqgI2a/eBcpxjj/1qCqaLtv7YLftbl9OjgglNZar5LY5uygkgho OHE2jCslAUz9482uG+zTpmO2jsO8MpakCXKenDeFw6Z1LZKccR0fKUlCu3gt6vJqVGiO wP27kYL3I4d4Tct7+ZT/04avyT5l0aTehdLYp15nQsGYMxRhnFzGPJugsCJPNrHYsD6A 6ms66qGEwmkAZojEu3C/r7l2T1A6plyu8NPYLMlzJ0RpwGwLncKewr2G70owP/GjW4EJ HmhQ== X-Gm-Message-State: APjAAAUAykJP/5dTQgHO3YR8cDM7hGv0zo82BkfiqL4t6FVYAThy5oeV cTlS0GYlAiE1T4p7v0w4BM4Rgk9E X-Google-Smtp-Source: APXvYqxiyzRImqiCbCJ7Y2drc1H100SPxZbL+3eCpxd8lZlpDyPJ9Ep4zYRiPEaNvO+yTl1jdJ/gIw== X-Received: by 2002:a17:902:e002:: with SMTP id ca2mr52902651plb.131.1554135586073; Mon, 01 Apr 2019 09:19:46 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id h11sm12503591pgq.57.2019.04.01.09.19.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:19:45 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 02/17] hwmon: (ina3221) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:22 -0700 Message-Id: <1554135577-11889-3-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. The patch was post-edited to retain comments. Signed-off-by: Guenter Roeck --- drivers/hwmon/ina3221.c | 48 +++++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c index 3626b87a5fd2..e6f43df0435c 100644 --- a/drivers/hwmon/ina3221.c +++ b/drivers/hwmon/ina3221.c @@ -458,44 +458,26 @@ static umode_t ina3221_is_visible(const void *drvdata, } } -static const u32 ina3221_in_config[] = { - /* 0: dummy, skipped in is_visible */ - HWMON_I_INPUT, - /* 1-3: input voltage Channels */ - HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL, - HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL, - HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL, - /* 4-6: shunt voltage Channels */ - HWMON_I_INPUT, - HWMON_I_INPUT, - HWMON_I_INPUT, - 0 -}; - -static const struct hwmon_channel_info ina3221_in = { - .type = hwmon_in, - .config = ina3221_in_config, -}; - #define INA3221_HWMON_CURR_CONFIG (HWMON_C_INPUT | \ HWMON_C_CRIT | HWMON_C_CRIT_ALARM | \ HWMON_C_MAX | HWMON_C_MAX_ALARM) -static const u32 ina3221_curr_config[] = { - INA3221_HWMON_CURR_CONFIG, - INA3221_HWMON_CURR_CONFIG, - INA3221_HWMON_CURR_CONFIG, - 0 -}; - -static const struct hwmon_channel_info ina3221_curr = { - .type = hwmon_curr, - .config = ina3221_curr_config, -}; - static const struct hwmon_channel_info *ina3221_info[] = { - &ina3221_in, - &ina3221_curr, + HWMON_CHANNEL_INFO(in, + /* 0: dummy, skipped in is_visible */ + HWMON_I_INPUT, + /* 1-3: input voltage Channels */ + HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL, + HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL, + /* 4-6: shunt voltage Channels */ + HWMON_I_INPUT, + HWMON_I_INPUT, + HWMON_I_INPUT), + HWMON_CHANNEL_INFO(curr, + INA3221_HWMON_CURR_CONFIG, + INA3221_HWMON_CURR_CONFIG, + INA3221_HWMON_CURR_CONFIG), NULL }; From patchwork Mon Apr 1 16:19:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880229 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE1BF17E1 for ; Mon, 1 Apr 2019 16:19:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9C3B26E4F for ; Mon, 1 Apr 2019 16:19:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE19427FB1; Mon, 1 Apr 2019 16:19:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C16F626E4F for ; Mon, 1 Apr 2019 16:19:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728359AbfDAQTs (ORCPT ); Mon, 1 Apr 2019 12:19:48 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:45051 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726854AbfDAQTs (ORCPT ); Mon, 1 Apr 2019 12:19:48 -0400 Received: by mail-pg1-f194.google.com with SMTP id i2so5005112pgj.11 for ; Mon, 01 Apr 2019 09:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=drLO5uVWcb+ywgpBK5n9qgEDkhgSyQmoetIy0hFNmlY=; b=Qg4hJJxsQFOz6eZcoSYQzL+oKXrCg7EqRT5T1qgTu/x7HE17VXENi05/c1Bt7LDKj7 //lHJPm4mn6KjL20RjGLOoJ565Qan8bMBDOZF9UL9ElSDPtDx0ZcBJZYxKa4+96cYQhU E/y4TfhJRmMICLkSMS10vDnMSrP3U5ceB92LxI0Sirc2DK0FNn26CtUlY1i6ZUfUb8xc avt6wNZ35n0VUS72pawBiWr4FOGlub3wJKJJTL670y+6fqR/mXiFVMp8wV15FsRGlOUf vyC6ky75QvMvNMrXVH0L2tiSWjhcQVUlX4D3XPUDwC3FecrEo2+HEDLj/jvuzztTNEnj Fq9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=drLO5uVWcb+ywgpBK5n9qgEDkhgSyQmoetIy0hFNmlY=; b=KUeMyNYi6/4s4DtOC+9nCDe8OEWbiUZjK9LAOTeZuDoJ93Uw8MSzIRjJN+5Wh3ii9M HKUGWjTeoD4J7QDXifj8rpXQhHWd0iaDXJrNBtMy4OQxjupvUgrY57svhY+5KmcAeuwl L/YhgxNBIfzPs2u6wmaf0dDVJtA06zk2/ir7BctgbOVz5YoXMbpjenj4hTEKMUwhgTd8 Nhz3F2o8oYX54VD/UQuy7O0dMqABgLf7u78MH10vvELYwk/v9iGbg4yPIiBA6/Ctvu3i cmyWn0iLMLjobTRJPh2sg/PY9L0JUvWscUiVH/CV++KdPY+ygaGjxjqP7EOu6RRjQnl6 Q7Uw== X-Gm-Message-State: APjAAAXdZNb+3EmrRv3JSNzEpssQgc9x/wLlPYjN31uf+ZWiWudlRMPe Bv6egBo4Xs8ojztgC2cAVMFFG0Ji X-Google-Smtp-Source: APXvYqz9FyGcpmGDmTiESNZsTHGEBCyT9HGlCv4wHMePsOXfM7BzRxFF1+fRTN+hHLr6FzKk2v9aYA== X-Received: by 2002:a63:751d:: with SMTP id q29mr25670996pgc.215.1554135587533; Mon, 01 Apr 2019 09:19:47 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id q87sm17969101pfa.133.2019.04.01.09.19.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:19:46 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 03/17] hwmon: (jc42) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:23 -0700 Message-Id: <1554135577-11889-4-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/jc42.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c index 4fa482ae0eb5..6b57a6d4e626 100644 --- a/drivers/hwmon/jc42.c +++ b/drivers/hwmon/jc42.c @@ -451,20 +451,12 @@ static int jc42_detect(struct i2c_client *client, struct i2c_board_info *info) return -ENODEV; } -static const u32 jc42_temp_config[] = { - HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MAX | HWMON_T_CRIT | - HWMON_T_MAX_HYST | HWMON_T_CRIT_HYST | - HWMON_T_MIN_ALARM | HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM, - 0 -}; - -static const struct hwmon_channel_info jc42_temp = { - .type = hwmon_temp, - .config = jc42_temp_config, -}; - static const struct hwmon_channel_info *jc42_info[] = { - &jc42_temp, + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MAX | + HWMON_T_CRIT | HWMON_T_MAX_HYST | + HWMON_T_CRIT_HYST | HWMON_T_MIN_ALARM | + HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM), NULL }; From patchwork Mon Apr 1 16:19:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880231 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA0B317E1 for ; Mon, 1 Apr 2019 16:19:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4E2A26E3C for ; Mon, 1 Apr 2019 16:19:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C952627E01; Mon, 1 Apr 2019 16:19:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7039626E4F for ; Mon, 1 Apr 2019 16:19:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727074AbfDAQTu (ORCPT ); Mon, 1 Apr 2019 12:19:50 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:34162 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726854AbfDAQTu (ORCPT ); Mon, 1 Apr 2019 12:19:50 -0400 Received: by mail-pl1-f193.google.com with SMTP id y6so4749318plt.1 for ; Mon, 01 Apr 2019 09:19:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=tNqFILptxHgjUs/akYL5N4I8yMmdv26I7ed6lh0XJW4=; b=Rn2xmNLhFqJSePosflbOfKMCpVYkptHMt/LbMfUOrzvzBd6lO85II9Fm8rO4nRLiOk TXVD48W0KZe0y4lgnnjoQumcv76W3NbbUq3ZHS3rV+ggCwTf+7X+rXNfNRC604xZLLYq azu1VDKQwbLFu8banpq3Vm2JAWMY/bZh1ff2nRkSEBRIeBeSklKdLi+wC6k/LPrf5dCI OTgiN/2ANTI4rp3vUDXwjHN3mE9NZWftkbk9UAGXoFmfBxllFx9FuMgCMq/oIOQ/sfpI jC6Me4nHgZMpweo+he8kiJTCPCMX9ttXYOQgne8ouAfweeTuy+Fn8CaDx/r61ib6LcRF yJ5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=tNqFILptxHgjUs/akYL5N4I8yMmdv26I7ed6lh0XJW4=; b=XW3jWpqOaxk0fC1B8zjrxODn31xwyB9x37xcqDo64FIApQIMO4Jx89edaHjteAgPte viqaN2idBkX52Nqd+ehWl+u7XtHCgUlDBFqdhPXEoIC3etJ8P5gkHr29nrv/pCBwz+3J 3ss0jIfeJEDh4tNYb2X6t8bIfGJB/iXFK8FJ2GCUbAaajpVDxemPVXFKbDthW6RYrkC+ Jic2RRXFjZRumiViKp9sqV3FfI8Uvsx/aqKQII5JoFHHRJEyNIH1+gfHQ9d1NuHIzVII 4kYvOB22AON9s7TxyvORbEDhCnzOdgXgpSrBzB93JGZ/YFJdyFzTZRacV9fF5hfBQH7+ 7EYA== X-Gm-Message-State: APjAAAXiWTNwP9oCxyM0eM6HqgytjcRu03XEjQlPZdvnYaOpQ/0lAe7c gLd2Pars5nvVYhRtD8QkfxaBD8lW X-Google-Smtp-Source: APXvYqyrfikJ/Eog9uyQ5H4fY8zIfBTJKEgazpRYShrOm9VCAfKQ6u2reUCWWqwngad29LOgz+fT+w== X-Received: by 2002:a17:902:e110:: with SMTP id cc16mr1603148plb.147.1554135589170; Mon, 01 Apr 2019 09:19:49 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id v6sm13945264pgv.92.2019.04.01.09.19.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:19:48 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 04/17] hwmon: (lm75) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:24 -0700 Message-Id: <1554135577-11889-5-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/lm75.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 447af07450f1..3155a04c997e 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -194,35 +194,11 @@ static umode_t lm75_is_visible(const void *data, enum hwmon_sensor_types type, return 0; } -/*-----------------------------------------------------------------------*/ - -/* device probe and removal */ - -/* chip configuration */ - -static const u32 lm75_chip_config[] = { - HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL, - 0 -}; - -static const struct hwmon_channel_info lm75_chip = { - .type = hwmon_chip, - .config = lm75_chip_config, -}; - -static const u32 lm75_temp_config[] = { - HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST, - 0 -}; - -static const struct hwmon_channel_info lm75_temp = { - .type = hwmon_temp, - .config = lm75_temp_config, -}; - static const struct hwmon_channel_info *lm75_info[] = { - &lm75_chip, - &lm75_temp, + HWMON_CHANNEL_INFO(chip, + HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST), NULL }; From patchwork Mon Apr 1 16:19:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880233 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5026617E1 for ; Mon, 1 Apr 2019 16:19:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39D7D26E3C for ; Mon, 1 Apr 2019 16:19:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DEA627FB1; Mon, 1 Apr 2019 16:19:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B526B26E3C for ; Mon, 1 Apr 2019 16:19:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728255AbfDAQTv (ORCPT ); Mon, 1 Apr 2019 12:19:51 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:36609 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728019AbfDAQTv (ORCPT ); Mon, 1 Apr 2019 12:19:51 -0400 Received: by mail-pl1-f194.google.com with SMTP id ck15so3532551plb.3 for ; Mon, 01 Apr 2019 09:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=o/YcELKZvVaAdUrzaD8aWVjc6f0q+Yfm9C0j/Wvg9F8=; b=Cx+S7tHYYORs2vZ3hPX+8sU58ZeqXPN+HoqBe1hoPBJ7n9GajRLTqgb8KinSQkGZK4 Sf/GQomEMdSCJtGlZyB6sVICmRge1oiR/cQOrQJrI86IrlWJTbIv7/6C+vJK4RIgfoFy 5AO3UALp5dqfpySdCShAfGd8RNRWKVmqWTZx7GZm98FYay1vZBU8m6JtAhiM4v0qoHJ2 fC2x8h7cBNQQBdL/YM94KwcisTJ3KnfQieuxBCXle7KaTVj0JMFarC51q6zGKdVX46by 7aB0ZV5MWmIy/4m8on3/RwrA9I4td2j0wvOh/n9uvhxw63r5lR48zTnPlgmMprnQJru9 ApyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=o/YcELKZvVaAdUrzaD8aWVjc6f0q+Yfm9C0j/Wvg9F8=; b=c26maQiqHJZU+6fiRVLq76THHK00GrhRfMVHQBGX0dVL/WluoWVA7qVge9gmW038gU DyxRdK8Sqn8KOF5YpDt9f2Z2EQhIhUf3x24teaE1x9IG4zRatiTeYlSKCpELxfHdU9tE 6Aj488QbeoyCSDja8XorkEM/eSrzi5beBGFZwvziHz01Iwy0VRWIU70JEnD2bIg6eoki hg+VMosYYCZ0DeYpmfVCDxtQY3JSQZHkkFBssTzyjIPx2NrhZ0cpzydDix9NtMPWGl0W MWe792b+IGPa5vI4Q9jU4XdmSR4b7GK3yGiiCj2865T8XkGHWS3zbVdbGpXpIY20w/MP 03EQ== X-Gm-Message-State: APjAAAWizr3UKEXm7dY1l2PAXs8OP5DcG9G8PXVA/Nx6RlwuMdgd2SPV nmaAJbtCDHhJXKGgktEPK7A9IxT8 X-Google-Smtp-Source: APXvYqwNfP7l28j6ep4LCW2ZZ98jzcasjrYgXdGfxiZxY/DzSznCVlLKqerrXICAu30D4NZ+eQ1JJw== X-Received: by 2002:a17:902:4681:: with SMTP id p1mr62771230pld.42.1554135590513; Mon, 01 Apr 2019 09:19:50 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id w3sm23789008pfn.179.2019.04.01.09.19.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:19:50 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 05/17] hwmon: (lm90) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:25 -0700 Message-Id: <1554135577-11889-6-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/lm90.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c index 480d70a51778..0f9c22b21ffa 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c @@ -1720,16 +1720,6 @@ static void lm90_regulator_disable(void *regulator) regulator_disable(regulator); } -static const u32 lm90_chip_config[] = { - HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL | HWMON_C_ALARMS, - 0 -}; - -static const struct hwmon_channel_info lm90_chip_info = { - .type = hwmon_chip, - .config = lm90_chip_config, -}; - static const struct hwmon_ops lm90_ops = { .is_visible = lm90_is_visible, @@ -1792,7 +1782,8 @@ static int lm90_probe(struct i2c_client *client, data->chip.ops = &lm90_ops; data->chip.info = data->info; - data->info[0] = &lm90_chip_info; + data->info[0] = HWMON_CHANNEL_INFO(chip, + HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL | HWMON_C_ALARMS); data->info[1] = &data->temp_info; info = &data->temp_info; From patchwork Mon Apr 1 16:19:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880235 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CD59E18E8 for ; Mon, 1 Apr 2019 16:19:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8FF126E3C for ; Mon, 1 Apr 2019 16:19:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD7E827FB1; Mon, 1 Apr 2019 16:19:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5313826E3C for ; Mon, 1 Apr 2019 16:19:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726854AbfDAQTx (ORCPT ); Mon, 1 Apr 2019 12:19:53 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:35600 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728038AbfDAQTx (ORCPT ); Mon, 1 Apr 2019 12:19:53 -0400 Received: by mail-pf1-f195.google.com with SMTP id t21so4825852pfe.2 for ; Mon, 01 Apr 2019 09:19:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=nRPYySe5R3lQEWfMMgUD4zw90LQSLBGRYWrOhZfab04=; b=ks30OCA5RaiAkbmOQ7txoemTgMnSNiz6iV5VdXfHsdLlk25ZEAuaU3SxPFyjFJKjPf QNqpgXrK3vOqwsi/BrKTWcAsC9a6HZkTZVnRmSA1Iqiqqx+YyVqS+caJfM27b7D2dt8m 6JqOo595QWl76+ATlkDZDHKos59Ji4GSYSWxFm/4Mikj5sNVX/6uGPOPB13qITJqvVdH wGMVdDSCgTKmMN4zdir/ch3h1+yJBMlUSk02DrRSmBCNegtuI6QfkortNEY22eO2lHne HEyjat3bT5S64yLsWalH2ZPJJcFIPEvP09rh7UZukraLyyn0MZka1cFlLDJgQV9uL1mn BcBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=nRPYySe5R3lQEWfMMgUD4zw90LQSLBGRYWrOhZfab04=; b=l9Y21bllFf56RZ7NP6ywe7CdjglirKPcv2dgTYRy0FNNLzISnKAjWudM/D/uFdotvV x2andIBrUi+EPPJfVjVGEtZfSRWoDN+FrrEdxOEyXspZ7BKltgetWHgGuM9Xp2ztG7RM vbLvGMJxNK+Nl/WwkCwOJZIqBsKPGPHsh1WSFqDSAn69GlC1LFlTDdIr9HsFu40P5wFQ jaI4DWuSfD0ZIv/qK8EDk5RFUQEhvKFjXI+zsp7wWCaz3wDj2f5iQawI5wFwsuN1VsCO HZMdrpxdGlQJFd0Kr/4BJbHW2wOm8mhiUqVA2j+BKbWMRj8i8BOZXFEPVyMYRFfdYlXV 1q5g== X-Gm-Message-State: APjAAAXWyiG6UyMxjZwFb5RPEFwS3p4Xm5SLDZ4xTZ6b+WiRnGPq65K1 mqKIPaOy3KDwDuhr3C/yGDdHbslz X-Google-Smtp-Source: APXvYqyOSHJjysUz4X2dOljdFkuNQ0fAPEgpRqgZsTRbDa7RI5MAvNbgEQXTFOJj+UjAVm1utz/Ldg== X-Received: by 2002:a63:5b4d:: with SMTP id l13mr16591339pgm.160.1554135591865; Mon, 01 Apr 2019 09:19:51 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id f87sm25207176pff.56.2019.04.01.09.19.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:19:51 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 06/17] hwmon: (lm95241) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:26 -0700 Message-Id: <1554135577-11889-7-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/lm95241.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/drivers/hwmon/lm95241.c b/drivers/hwmon/lm95241.c index 3ff188937158..6c5215e6d448 100644 --- a/drivers/hwmon/lm95241.c +++ b/drivers/hwmon/lm95241.c @@ -418,33 +418,15 @@ static void lm95241_init_client(struct i2c_client *client, data->model); } -static const u32 lm95241_chip_config[] = { - HWMON_C_UPDATE_INTERVAL, - 0 -}; - -static const struct hwmon_channel_info lm95241_chip = { - .type = hwmon_chip, - .config = lm95241_chip_config, -}; - -static const u32 lm95241_temp_config[] = { - HWMON_T_INPUT, - HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN | HWMON_T_TYPE | - HWMON_T_FAULT, - HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN | HWMON_T_TYPE | - HWMON_T_FAULT, - 0 -}; - -static const struct hwmon_channel_info lm95241_temp = { - .type = hwmon_temp, - .config = lm95241_temp_config, -}; - static const struct hwmon_channel_info *lm95241_info[] = { - &lm95241_chip, - &lm95241_temp, + HWMON_CHANNEL_INFO(chip, + HWMON_C_UPDATE_INTERVAL), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT, + HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN | + HWMON_T_TYPE | HWMON_T_FAULT, + HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN | + HWMON_T_TYPE | HWMON_T_FAULT), NULL }; From patchwork Mon Apr 1 16:19:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880237 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5FC8017E1 for ; Mon, 1 Apr 2019 16:19:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A80926E3C for ; Mon, 1 Apr 2019 16:19:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E9B727FB1; Mon, 1 Apr 2019 16:19:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D653426E3C for ; Mon, 1 Apr 2019 16:19:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728499AbfDAQTy (ORCPT ); Mon, 1 Apr 2019 12:19:54 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:34169 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728038AbfDAQTy (ORCPT ); Mon, 1 Apr 2019 12:19:54 -0400 Received: by mail-pl1-f193.google.com with SMTP id y6so4749404plt.1 for ; Mon, 01 Apr 2019 09:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=c+ZzZYPNs+UKwnepGILmiCM5G2GAMsPPUmYUFUA+Cho=; b=EDFW6PviUDkU5PWwP5tEeMMXjyYsE/5A76rKy3ZUrcn3/PTxnDw9cRr9hk1QzE3y48 /GbJuRhkBk2aJkcDdPuWf7a2JWCJgra8QPUhlOqJoZT0O9sTpkI5wRhsXvXgWssWFhVI cI6XQhcpZth29PcbButyAc6MtQRIp5RGVTZkh0YTfH1WrW8QNBqEeKYWwYqwxYCizyAV 2MLNwgA/LIa+omnqstXsLNMWTjVhqazQmfgS4xF/xPjIMayOarus/mP42pG+Up8QKFTR NmeRWKsrBYTNHxa76E1N2iAr8Kb8GcuZvtgDVHqjGtfUn1PBOs0sbE8QoJxx0tpT4sca RHEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=c+ZzZYPNs+UKwnepGILmiCM5G2GAMsPPUmYUFUA+Cho=; b=lBQhQAdpzN3RYTjrbuNkTUbXVfEWSut3VL0AnphjWpSUO626Sx8UhRKV/p949OK1J6 7Dx/4kORFMI2GvnwyT++qmTZgktKRr2tKp4vJVssiMjV599KgZpPswaYs2y/99K43yal 8VcVJmBJeY3mpqL10oYqrSpE72VvfSeHWBTmNxhDt2dwTBNuAS134JkLENNLoF4BfvM3 qV3wn3rsT48Z8dXgs3nogFFt3TQMlp4vvt7TJSAlPdoaG7uPONmrsNMTkfRmToXOfKeM TpaTjYBz8UUEwQ+KuqAu6Ar52nUvcGXSceLrHbVH0aRUVftL+0NA5HIqqBw1HkwN/+vi rLjA== X-Gm-Message-State: APjAAAWdZ229A3qaUrufrBB9j6BcVx8RCnGrQiYlwc084YBOwEMMd7hY 9BAdouA3ah0/gY6a83LTq4nA0wrS X-Google-Smtp-Source: APXvYqxT+ZBiEo/E20Uf+z0XVxvFdqJbVTa6FQNLZplRk7gXosDsR6tey3WbF5lDjOoXA7RyTYBTkA== X-Received: by 2002:a17:902:b43:: with SMTP id 61mr64620060plq.83.1554135593412; Mon, 01 Apr 2019 09:19:53 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id 28sm17247931pgq.59.2019.04.01.09.19.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:19:52 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 07/17] hwmon: (lm95245) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:27 -0700 Message-Id: <1554135577-11889-8-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/lm95245.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/drivers/hwmon/lm95245.c b/drivers/hwmon/lm95245.c index e4cac3a04536..c7e04f28ac90 100644 --- a/drivers/hwmon/lm95245.c +++ b/drivers/hwmon/lm95245.c @@ -545,32 +545,16 @@ static const struct regmap_config lm95245_regmap_config = { .use_single_write = true, }; -static const u32 lm95245_chip_config[] = { - HWMON_C_UPDATE_INTERVAL, - 0 -}; - -static const struct hwmon_channel_info lm95245_chip = { - .type = hwmon_chip, - .config = lm95245_chip_config, -}; - -static const u32 lm95245_temp_config[] = { - HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_CRIT_ALARM, - HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST | HWMON_T_CRIT | - HWMON_T_CRIT_HYST | HWMON_T_FAULT | HWMON_T_MAX_ALARM | - HWMON_T_CRIT_ALARM | HWMON_T_TYPE | HWMON_T_OFFSET, - 0 -}; - -static const struct hwmon_channel_info lm95245_temp = { - .type = hwmon_temp, - .config = lm95245_temp_config, -}; - static const struct hwmon_channel_info *lm95245_info[] = { - &lm95245_chip, - &lm95245_temp, + HWMON_CHANNEL_INFO(chip, + HWMON_C_UPDATE_INTERVAL), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_HYST | + HWMON_T_CRIT_ALARM, + HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST | + HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_FAULT | + HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM | + HWMON_T_TYPE | HWMON_T_OFFSET), NULL }; From patchwork Mon Apr 1 16:19:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880239 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3FF3D18E8 for ; Mon, 1 Apr 2019 16:19:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AC5426E3C for ; Mon, 1 Apr 2019 16:19:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EEBA27FB1; Mon, 1 Apr 2019 16:19:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6800626E3C for ; Mon, 1 Apr 2019 16:19:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728587AbfDAQT4 (ORCPT ); Mon, 1 Apr 2019 12:19:56 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:44035 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728551AbfDAQT4 (ORCPT ); Mon, 1 Apr 2019 12:19:56 -0400 Received: by mail-pg1-f194.google.com with SMTP id i2so5005284pgj.11 for ; Mon, 01 Apr 2019 09:19:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=959HrBKQJTeSyXEASVi2q7APYGGUhN9iUFpIa6ora2o=; b=hbYHvv2FxOtPu2JeYJ7rNBsHPumeXhparcywdKyus+8+Fxye70vE1dP+Ld0LFg/uzQ r+sgQMJ0NtSeNPK8zptoxwDogkqc0Poif6WnCXqH0OY268lLdiRfMuzX00bF6m2ohAHw h8HqJ7tPgZHae3ACqOpsj3VXu0KhspSrK0FAOnXy1f5q18mmQdzWVdXT3mdkJ0tdhwlA SdYDusqaz75eCWBqkRUby1bqBuEetFOInYyP8rXGDb07a979LZ4VHOfob5R5ujkgOPO7 D92Oeupmq+Vknv24pG23b0+owQvd2vK/jE9E1i7HBt80Y2Eh9sP/OcT7v7bZDUq4WwEj Btrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=959HrBKQJTeSyXEASVi2q7APYGGUhN9iUFpIa6ora2o=; b=Pvsk8LxJU19COADL01YgyWtY1V1k6ajDywVSu3h8Es7W7eX9GEzoDAY9Pf8PC2J9gq YOk+ochek/68j4HvKMBQfFb8V6BrJ/VmGHtlMXdyVYXt0G35AmAEDNThZQ8p/Eu03iqD ielO+ZJYVmFpwI52+0Xw/yS9TSaF7N1ljsQSDASGBcyQ/9NDemFsepsLJCQBoJ/7d0ci v5M8xCEVNXHQLAQXn9KrFn03zRtbtKe/xHKmV9FcZFBlR3mtMGNb8PaKCekjcawzwhRZ Nwc5qNXJ4527A1A5koTTQhkiiq80nJIYIS4lfRaevu4Cvnw+qAMh+yFNfbtmsBYksLue 2KMw== X-Gm-Message-State: APjAAAUCcD0OthmdaMrxE8um6gTvRY2lnmz933KcWU+KQY8gu7pAG0S7 ZcP+GQMGS5klI38jekGXS5ldlqsD X-Google-Smtp-Source: APXvYqzwMwW0izvdr7R+Iz4pm6sEmB6/sFOw2t7lI08dH0sJ6Ollf+hwWsGsoyoePILb6IJnw/nTXA== X-Received: by 2002:a65:518b:: with SMTP id h11mr61658351pgq.41.1554135594944; Mon, 01 Apr 2019 09:19:54 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id r11sm28236471pga.87.2019.04.01.09.19.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:19:54 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 08/17] hwmon: (ltc4245) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:28 -0700 Message-Id: <1554135577-11889-9-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/ltc4245.c | 73 ++++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 50 deletions(-) diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c index 34d0653ca607..26542635de9b 100644 --- a/drivers/hwmon/ltc4245.c +++ b/drivers/hwmon/ltc4245.c @@ -390,57 +390,30 @@ static umode_t ltc4245_is_visible(const void *_data, } } -static const u32 ltc4245_in_config[] = { - HWMON_I_INPUT, /* dummy, skipped in is_visible */ - HWMON_I_INPUT | HWMON_I_MIN_ALARM, - HWMON_I_INPUT | HWMON_I_MIN_ALARM, - HWMON_I_INPUT | HWMON_I_MIN_ALARM, - HWMON_I_INPUT | HWMON_I_MIN_ALARM, - HWMON_I_INPUT | HWMON_I_MIN_ALARM, - HWMON_I_INPUT | HWMON_I_MIN_ALARM, - HWMON_I_INPUT | HWMON_I_MIN_ALARM, - HWMON_I_INPUT | HWMON_I_MIN_ALARM, - HWMON_I_INPUT, - HWMON_I_INPUT, - HWMON_I_INPUT, - 0 -}; - -static const struct hwmon_channel_info ltc4245_in = { - .type = hwmon_in, - .config = ltc4245_in_config, -}; - -static const u32 ltc4245_curr_config[] = { - HWMON_C_INPUT | HWMON_C_MAX_ALARM, - HWMON_C_INPUT | HWMON_C_MAX_ALARM, - HWMON_C_INPUT | HWMON_C_MAX_ALARM, - HWMON_C_INPUT | HWMON_C_MAX_ALARM, - 0 -}; - -static const struct hwmon_channel_info ltc4245_curr = { - .type = hwmon_curr, - .config = ltc4245_curr_config, -}; - -static const u32 ltc4245_power_config[] = { - HWMON_P_INPUT, - HWMON_P_INPUT, - HWMON_P_INPUT, - HWMON_P_INPUT, - 0 -}; - -static const struct hwmon_channel_info ltc4245_power = { - .type = hwmon_power, - .config = ltc4245_power_config, -}; - static const struct hwmon_channel_info *ltc4245_info[] = { - <c4245_in, - <c4245_curr, - <c4245_power, + HWMON_CHANNEL_INFO(in, + HWMON_I_INPUT, + HWMON_I_INPUT | HWMON_I_MIN_ALARM, + HWMON_I_INPUT | HWMON_I_MIN_ALARM, + HWMON_I_INPUT | HWMON_I_MIN_ALARM, + HWMON_I_INPUT | HWMON_I_MIN_ALARM, + HWMON_I_INPUT | HWMON_I_MIN_ALARM, + HWMON_I_INPUT | HWMON_I_MIN_ALARM, + HWMON_I_INPUT | HWMON_I_MIN_ALARM, + HWMON_I_INPUT | HWMON_I_MIN_ALARM, + HWMON_I_INPUT, + HWMON_I_INPUT, + HWMON_I_INPUT), + HWMON_CHANNEL_INFO(curr, + HWMON_C_INPUT | HWMON_C_MAX_ALARM, + HWMON_C_INPUT | HWMON_C_MAX_ALARM, + HWMON_C_INPUT | HWMON_C_MAX_ALARM, + HWMON_C_INPUT | HWMON_C_MAX_ALARM), + HWMON_CHANNEL_INFO(power, + HWMON_P_INPUT, + HWMON_P_INPUT, + HWMON_P_INPUT, + HWMON_P_INPUT), NULL }; From patchwork Mon Apr 1 16:19:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880241 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2346E18E8 for ; Mon, 1 Apr 2019 16:19:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E6B326E3C for ; Mon, 1 Apr 2019 16:19:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0068B27FB1; Mon, 1 Apr 2019 16:19:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F43A26E3C for ; Mon, 1 Apr 2019 16:19:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728557AbfDAQT5 (ORCPT ); Mon, 1 Apr 2019 12:19:57 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:39444 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728551AbfDAQT5 (ORCPT ); Mon, 1 Apr 2019 12:19:57 -0400 Received: by mail-pg1-f195.google.com with SMTP id k3so5015955pga.6 for ; Mon, 01 Apr 2019 09:19:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=12Mr84x/LCXzxT+n+Sz9VGrbWBqGy2OlW0sK5mV/pz8=; b=fdHFm+hfwCd2acfGkKv+tl+p6/14sjniFOIXKkAFjqxI63kGbYiDCViHSofmixe/Q0 t2Knu1oYo4k36SaJ4fEnlOb2rhvtKMFpCV4ZT2CBilbt9ZCjeB4l295WzB+G6M+Z1nP1 zCMm0eQzsgFTHAhlI7yaC+hkv4GIVh+C4Y6eotTt2R7c53Zu3sfp4L4xpqyAbMfFO9y5 sEdtXq/UIbFdzTAErn/Rg8Q/koMF+lpPYv2p0K193KPpi/fPk61JDtIUCusSIfI9SFKZ 3kQHoxLKomM35BspAWtRfJjdNcXXXujmbfwFdd1j061opZ74jXJZcwxED45BRBSaG46U pG8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=12Mr84x/LCXzxT+n+Sz9VGrbWBqGy2OlW0sK5mV/pz8=; b=aOKE2sO23BbtR40dN3a7ySLF3xRoMKIXBdfsE5sguyAEMXx04TOpkrwbK6oTF2vF/E tGYCcaRNFWRVHYP5q6JJ0yGr/hHTgT0xiVU5s477ECAYLVpE5O/99NIP9ILt/TzPgsuO xhfBC+EeVsXj1PrYKfHvX3dCriWVg04DCuUpZuVyhZQqBQRLMlSB1154cUpzxPn7Qi17 aCdwhnfB8KieIL647345IXhSPgOTBGwNOlTTHd/G8R9qzncIITdEWPa0LECIMN09PffE mjzq5eQzJj/0zDhBydT7nn1beDM8MVI7B6CXrUZgZzc/f1+kPWQ72UDft7nRu57Ju8gG gWoQ== X-Gm-Message-State: APjAAAX9HVWbHsA4Bmk2VpGwXARaV93XiUtW6fZG1e0XAIFqKgYbCHBV Hroa0ctqcODNYMMW4TqB9IvAQ/aH X-Google-Smtp-Source: APXvYqyxJBOP1afKWkAK/0gALWeUT5zKvnIJSKVdSmaCxLbAoWRwzPrdo7aPVdSQi6bwNta4j4dg4Q== X-Received: by 2002:aa7:884b:: with SMTP id k11mr2343607pfo.49.1554135596320; Mon, 01 Apr 2019 09:19:56 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id p26sm22751482pfa.49.2019.04.01.09.19.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:19:55 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 09/17] hwmon: (ltq-cputemp) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:29 -0700 Message-Id: <1554135577-11889-10-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/ltq-cputemp.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/drivers/hwmon/ltq-cputemp.c b/drivers/hwmon/ltq-cputemp.c index 1d33f94594c1..570791f0e024 100644 --- a/drivers/hwmon/ltq-cputemp.c +++ b/drivers/hwmon/ltq-cputemp.c @@ -77,29 +77,11 @@ static umode_t ltq_is_visible(const void *_data, enum hwmon_sensor_types type, } } -static const u32 ltq_chip_config[] = { - HWMON_C_REGISTER_TZ, - 0 -}; - -static const struct hwmon_channel_info ltq_chip = { - .type = hwmon_chip, - .config = ltq_chip_config, -}; - -static const u32 ltq_temp_config[] = { - HWMON_T_INPUT, - 0 -}; - -static const struct hwmon_channel_info ltq_temp = { - .type = hwmon_temp, - .config = ltq_temp_config, -}; - static const struct hwmon_channel_info *ltq_info[] = { - <q_chip, - <q_temp, + HWMON_CHANNEL_INFO(chip, + HWMON_C_REGISTER_TZ), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT), NULL }; From patchwork Mon Apr 1 16:19:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880243 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5713813B5 for ; Mon, 1 Apr 2019 16:20:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4174F26E3C for ; Mon, 1 Apr 2019 16:20:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 359EE28346; Mon, 1 Apr 2019 16:20:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A37426E3C for ; Mon, 1 Apr 2019 16:19:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728635AbfDAQT7 (ORCPT ); Mon, 1 Apr 2019 12:19:59 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:39245 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728626AbfDAQT6 (ORCPT ); Mon, 1 Apr 2019 12:19:58 -0400 Received: by mail-pf1-f193.google.com with SMTP id i17so4821857pfo.6 for ; Mon, 01 Apr 2019 09:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=cKJ9AmGauN0g0jciBSVQw0iCxFHg40qHY8hUnYfglT4=; b=OLMaUYmtUaAENzIr1rxBzltFP+9IWZQ8FwT2+v4twhHdC9Kt7U247SmLdkmVzRWoRV vYMYcSrnUnvodQj7NfyYbUVWZjnGO5j1XqdiYt7gDj/m2oJFvplmsj2gfBa8c2t8yjdm ZH2k3e5u5l+03K5VyvhNOuEkIVAqk3Wq33N9hw6JqpqDimknkBgaMTGq99X7oTQ2Umcj xe3QhiJjCp9ExN9GJRzaORBnzb9/7P2qlv3EftqLwv/H/0x7nx/Whb1BOTEqbu6DBZv7 gMnFLMVl6737m16ncWeT5dkHLE8p8ZjlPvnBxk4J9JVbNYhBcf4LqAykSJbhkw8Esh2Y 7WEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=cKJ9AmGauN0g0jciBSVQw0iCxFHg40qHY8hUnYfglT4=; b=hFcwyAGTE9SUnV1msU45BKKGBF2Tray0RcareWRQD4pFp7Edcjw9k9ShqkMXd0qhRj 6znzI+ThxVuZfaPYJbSpBm+ZNQpMWaTHyXxZlrzRA3TNH/WRU0caVwst9L4afLznlAES b5LWznQzIjckflK91q4N134Fe8dlXvTgQ1asBoQcHiKIf22TdDz+vWn4LhTPAIXueNJ6 8fPxElR57Ej77ecP64FqVWCQOMBgvKLFk42w3haTuoH5/3/46S6KthURu6YtLmMbpZxq XpTjNqnmdBCJawfWq8wUj4vyI5w7YGM1qz5sguTUvOUU0C1AYMhDNUrHDTOzsq8KHsFz VkoA== X-Gm-Message-State: APjAAAVuxXY+XVxukto9lX1RkMpK0pvvk6bVEr1utpEL2UmG8IMvlixl exl02anTqUuY7paLJy0tRHqWV6ia X-Google-Smtp-Source: APXvYqy87mGWmtU5xL6VhSDj5Iuh2WZbMSv3q8ASzUSemo41HYasEYjFbj1R4OMNlzXENiZ4dTl5vg== X-Received: by 2002:a62:1815:: with SMTP id 21mr17372289pfy.107.1554135597941; Mon, 01 Apr 2019 09:19:57 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id h4sm7445660pgn.20.2019.04.01.09.19.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:19:57 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 10/17] hwmon: (max31790) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:30 -0700 Message-Id: <1554135577-11889-11-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/max31790.c | 58 +++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 38 deletions(-) diff --git a/drivers/hwmon/max31790.c b/drivers/hwmon/max31790.c index 722bcbb9865a..0b0b04d36931 100644 --- a/drivers/hwmon/max31790.c +++ b/drivers/hwmon/max31790.c @@ -400,45 +400,27 @@ static umode_t max31790_is_visible(const void *data, } } -static const u32 max31790_fan_config[] = { - HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - 0 -}; - -static const struct hwmon_channel_info max31790_fan = { - .type = hwmon_fan, - .config = max31790_fan_config, -}; - -static const u32 max31790_pwm_config[] = { - HWMON_PWM_INPUT | HWMON_PWM_ENABLE, - HWMON_PWM_INPUT | HWMON_PWM_ENABLE, - HWMON_PWM_INPUT | HWMON_PWM_ENABLE, - HWMON_PWM_INPUT | HWMON_PWM_ENABLE, - HWMON_PWM_INPUT | HWMON_PWM_ENABLE, - HWMON_PWM_INPUT | HWMON_PWM_ENABLE, - 0 -}; - -static const struct hwmon_channel_info max31790_pwm = { - .type = hwmon_pwm, - .config = max31790_pwm_config, -}; - static const struct hwmon_channel_info *max31790_info[] = { - &max31790_fan, - &max31790_pwm, + HWMON_CHANNEL_INFO(fan, + HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT), + HWMON_CHANNEL_INFO(pwm, + HWMON_PWM_INPUT | HWMON_PWM_ENABLE, + HWMON_PWM_INPUT | HWMON_PWM_ENABLE, + HWMON_PWM_INPUT | HWMON_PWM_ENABLE, + HWMON_PWM_INPUT | HWMON_PWM_ENABLE, + HWMON_PWM_INPUT | HWMON_PWM_ENABLE, + HWMON_PWM_INPUT | HWMON_PWM_ENABLE), NULL }; From patchwork Mon Apr 1 16:19:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 181C313B5 for ; Mon, 1 Apr 2019 16:20:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03B0726D08 for ; Mon, 1 Apr 2019 16:20:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC2F427FB1; Mon, 1 Apr 2019 16:20:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E83426E3C for ; Mon, 1 Apr 2019 16:20:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728551AbfDAQUA (ORCPT ); Mon, 1 Apr 2019 12:20:00 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:40126 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728626AbfDAQUA (ORCPT ); Mon, 1 Apr 2019 12:20:00 -0400 Received: by mail-pf1-f194.google.com with SMTP id c207so4818612pfc.7 for ; Mon, 01 Apr 2019 09:19:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=NMmw9BRMDw18YfC4U/C3WT8wc/d09d2AVewUuTbISeg=; b=Vrx9e3gM7tqsfy2zxOOa8WTQwF7J0gb3XF/P8x2/IAocZqUoEweoL2eVYj9HaiZYDg PESUKS2YSClkntntl3bEYLBsa/BIdU3fg9hOnmWfJl+niqo91dZDZK84BPyK2tmEbOSt gwkqnAKC6uTLaVfJEp/7fOfvpvjo9ejs/ejnbcVXPnYu89IIOWRd5rHo3QiIt0oF5SvK 5yQ7PVvID0K90tVP6hxcq84ROsq3qp69sjXz/0bda29wF32apqV9ELm3nTc+U6e35raw InRKvcssGbCnnWJ3zMCwpcRQKQNKArmiPuEu3WKSTamkTAB9h6vqsmmkIYdHnmdl7JAf 2CBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=NMmw9BRMDw18YfC4U/C3WT8wc/d09d2AVewUuTbISeg=; b=Rb9eSLVoSrogD94ISuJOLrxCq5Eu9gHsPQxErZfS6mWrY8vLGnTFMrtpcVv/+ZweQ7 golrmQ1rb33wCWBDNjgbgNOsnJ5LlF35c3tHIlxeSvUVsEecANKmE0+uzT051CtwjrSj SXXCQzd5QlHekoVZpt10qCVyUWUxaOlSjogBJhvF/OFf2O6i80nltT/FYIfwLXAPiRzp My4Hd5g43RtN5DqRrgsmXtGLEusxYuUXz1/ae4CWNwyUuvJ2EZTerOM17Xg5pw/kWs8Q yOsW02M2rKki9rfbm8P9ByU3WE9OzUkRfRFb4dDk+xNbHqxg/Ia6x/B3bUX6LhuARuD1 f7MA== X-Gm-Message-State: APjAAAXHuFTH6ajZjoLyci0FqEtWesYZn75bXwi5hkRJRxmwDJ9vAw+z I7iqZ+hceNWoT9vR13Rsv8U4Tcd6 X-Google-Smtp-Source: APXvYqznnz+Bo/7ushYRKLwQQH7TUcf7Uzv21I/33brcmzZF2qY0rUDTruc5ICJHh6YzYsFUXynmIw== X-Received: by 2002:a65:6108:: with SMTP id z8mr47687565pgu.106.1554135599390; Mon, 01 Apr 2019 09:19:59 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id l63sm15720745pfc.89.2019.04.01.09.19.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:19:58 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 11/17] hwmon: (max6621) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:31 -0700 Message-Id: <1554135577-11889-12-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/max6621.c | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/drivers/hwmon/max6621.c b/drivers/hwmon/max6621.c index 35555f0eefb9..0c399e407de3 100644 --- a/drivers/hwmon/max6621.c +++ b/drivers/hwmon/max6621.c @@ -458,37 +458,19 @@ static const struct regmap_config max6621_regmap_config = { .num_reg_defaults = ARRAY_SIZE(max6621_regmap_default), }; -static u32 max6621_chip_config[] = { - HWMON_C_REGISTER_TZ, - 0 -}; - -static const struct hwmon_channel_info max6621_chip = { - .type = hwmon_chip, - .config = max6621_chip_config, -}; - -static const u32 max6621_temp_config[] = { - HWMON_T_INPUT | HWMON_T_LABEL | HWMON_T_OFFSET, - HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL, - HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL, - HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL, - HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL, - HWMON_T_INPUT | HWMON_T_LABEL, - HWMON_T_INPUT | HWMON_T_LABEL, - HWMON_T_INPUT | HWMON_T_LABEL, - HWMON_T_INPUT | HWMON_T_LABEL, - 0 -}; - -static const struct hwmon_channel_info max6621_temp = { - .type = hwmon_temp, - .config = max6621_temp_config, -}; - static const struct hwmon_channel_info *max6621_info[] = { - &max6621_chip, - &max6621_temp, + HWMON_CHANNEL_INFO(chip, + HWMON_C_REGISTER_TZ), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT | HWMON_T_LABEL | HWMON_T_OFFSET, + HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL), NULL }; From patchwork Mon Apr 1 16:19:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880247 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A58E818E8 for ; Mon, 1 Apr 2019 16:20:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1FC228541 for ; Mon, 1 Apr 2019 16:20:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A18F2287C5; Mon, 1 Apr 2019 16:20:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CBA228541 for ; Mon, 1 Apr 2019 16:20:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728626AbfDAQUC (ORCPT ); Mon, 1 Apr 2019 12:20:02 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:40129 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728038AbfDAQUB (ORCPT ); Mon, 1 Apr 2019 12:20:01 -0400 Received: by mail-pf1-f195.google.com with SMTP id c207so4818645pfc.7 for ; Mon, 01 Apr 2019 09:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xXohVNKqcgxXYY2TmsIOkDNeXzwT3t2//WuFOjq0Uxs=; b=GAoMW1leodniFUILCfTpH/CbB4B+6WXn6VI1/+BVeX8Lkj28Hc38JImgIOyEfw+c4x KDkh9qMFZa5xcbnBkx2rhddlbPg+AxsA0LCP40aalw/TsWsBiNeko2ZkENcliV3J3DNM 2xntdHVuOL0CmCKAlOuRTrzjGKPBrFZBMCW6zzu9XGJ6hgnQRMQHe6+T5duBkIrW0lo2 Sx4XscYMUL25yPP+sXp6HolpefkGLGHqfbCa3C1d7BKb9o6FuqEydyQsIcaf7nGIWblS oA5vARrCbNy5P6h8nEdbGv1Dus1kHnAtmPNZ3Efpt8B/xiAF7lK+3XkDZoeFUcBaKiWh wj1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=xXohVNKqcgxXYY2TmsIOkDNeXzwT3t2//WuFOjq0Uxs=; b=DDxbWcZ029vQowiJm+mfRO8ckq/ve68gkHPVA8oT05v5vJgwxLaF8OP/rTx4mdrIKB ix8SK1E0nalG8j+/MRcBKnm9P19BoQOs/3wdO+CTlQObxLezhcmdWaRnFUN6gF9322Ln MvogygmpuR7rJRRTnCm0/dD2Oo8nsVllaqK50ytijb4c2ec6a5iAtDjjPelKiMirz2Ch CNsSi1y627CMpFCVfEa3W4tzdsqHl+2+TNEDulj7EJLxSgGaPiBkbsckF4t0XrExXZZS 4qzzCi6TG8NdsfKjTTreStlgFA5xUPGsk96KYtrla3ak2udAgJgoigxHi/26zydkq2bE 76wA== X-Gm-Message-State: APjAAAXttXFOZxit7YP10r1mHWbzZfxQtJV9nWaFcP/h+PuZRedqxXCo atr4Uu5zvI0IC+fsldso4LKU5FM6 X-Google-Smtp-Source: APXvYqwETLBSaunGlKwE+xewO8OSiFhiXVxvL3ophbi5Y23x75gF0qLIzqkrLLIOzPKORej/1etSYQ== X-Received: by 2002:a63:5061:: with SMTP id q33mr34962573pgl.218.1554135601006; Mon, 01 Apr 2019 09:20:01 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id p6sm1580730pfd.122.2019.04.01.09.20.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:20:00 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 12/17] hwmon: (mlxreg-fan) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:32 -0700 Message-Id: <1554135577-11889-13-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/mlxreg-fan.c | 48 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/drivers/hwmon/mlxreg-fan.c b/drivers/hwmon/mlxreg-fan.c index 44d4b1af1550..f816d2ae1e58 100644 --- a/drivers/hwmon/mlxreg-fan.c +++ b/drivers/hwmon/mlxreg-fan.c @@ -229,40 +229,22 @@ mlxreg_fan_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr, return 0; } -static const u32 mlxreg_fan_hwmon_fan_config[] = { - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - HWMON_F_INPUT | HWMON_F_FAULT, - 0 -}; - -static const struct hwmon_channel_info mlxreg_fan_hwmon_fan = { - .type = hwmon_fan, - .config = mlxreg_fan_hwmon_fan_config, -}; - -static const u32 mlxreg_fan_hwmon_pwm_config[] = { - HWMON_PWM_INPUT, - 0 -}; - -static const struct hwmon_channel_info mlxreg_fan_hwmon_pwm = { - .type = hwmon_pwm, - .config = mlxreg_fan_hwmon_pwm_config, -}; - static const struct hwmon_channel_info *mlxreg_fan_hwmon_info[] = { - &mlxreg_fan_hwmon_fan, - &mlxreg_fan_hwmon_pwm, + HWMON_CHANNEL_INFO(fan, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT, + HWMON_F_INPUT | HWMON_F_FAULT), + HWMON_CHANNEL_INFO(pwm, + HWMON_PWM_INPUT), NULL }; From patchwork Mon Apr 1 16:19:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880249 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 17B6F17E1 for ; Mon, 1 Apr 2019 16:20:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0179E28541 for ; Mon, 1 Apr 2019 16:20:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E97C6287C5; Mon, 1 Apr 2019 16:20:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD40A287C2 for ; Mon, 1 Apr 2019 16:20:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728640AbfDAQUD (ORCPT ); Mon, 1 Apr 2019 12:20:03 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:38561 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728007AbfDAQUD (ORCPT ); Mon, 1 Apr 2019 12:20:03 -0400 Received: by mail-pf1-f195.google.com with SMTP id 10so4821417pfo.5 for ; Mon, 01 Apr 2019 09:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=5PgGJ4ZR3na42kqz0YoBDR/EzAl1rkF8yMpTdSJNSL0=; b=p2w2hlTjBZNncrMgZ2QcaT9ymKLl3bR+P2Um3D6+xSKzWRUt7zM5n9uT1gvvy1LNX/ Ce/V01xw0JQv6zSasgjllOFYoGJRr+oZ5sSpDBF9F3h+w9CgbqtfXmrptPvR/G9EsKdi Jl7rB+/xorQ2tJSxcqmMX3c+CtNm0MVUOu3KKgl8fm28q0VVWd0nf8CVmNt8hUWMUsY9 R7yaBuCCbrZXCvpCmmMej5BzpIXi3GwAl6+0US9YGpRz5yc3UYDujrjg2FL7M3RxFdyx Ur79SYYwfNtHdTlSzPUfsGvMQCPi2gbh0zsQBDEMr7DFrU2y6Bu0jur6gyd+oBfMuxnk Yb4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=5PgGJ4ZR3na42kqz0YoBDR/EzAl1rkF8yMpTdSJNSL0=; b=WGyWwNnnfsifwcuiKcPKgsBoX/ZKBH3OWAh3EVxKW5OE5vdtW6yssoFWyEdNacVV4n eXtwDsniU0jq9GvuSvRGejRlAgh8ftCyXoQVt5loBu/zHO69zGaB4S26CgZNKs9ul/c2 9h4TFjpflKqw5PCi0pPa/74g/e+bwI83OKSPx4nBF8LNePrjjS+P9xywpj0M52lpyJZ8 ar6EMB0w8CdhW6wtUuN6ipdsCpu5vvqOINnzNvg7xAnMBzzqcaxh3bibhDXyDxezIsTF uegcf80PX0lhz54bJg/LLasJSyMC9VuaMH2ERxrYUhaBORRk9WE9pcwtHl1JMKNPfRxQ lsbw== X-Gm-Message-State: APjAAAVjhmMrGLET7FAUMdYYOinws9i792pU9IBqEaGkoCgbtL+nM2fq hTq2b3ht7lMvkfRgq+u1AbFtACXP X-Google-Smtp-Source: APXvYqyMaeunuV7Vj7sziBohnCF6Vc58HfBzrR/VK02Wj68UwbwSI7hYPC4fhkukpXk8MjC4XDSgBA== X-Received: by 2002:aa7:928d:: with SMTP id j13mr64529514pfa.112.1554135602481; Mon, 01 Apr 2019 09:20:02 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id q80sm9265070pfa.66.2019.04.01.09.20.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:20:01 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck , Avi Fishman , Tomer Maimon , Patrick Venture , Nancy Yuen , Brendan Higgins Subject: [PATCH 13/17] hwmon: (npcm750-pwm-fan) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:33 -0700 Message-Id: <1554135577-11889-14-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Cc: Avi Fishman Cc: Tomer Maimon Cc: Patrick Venture Cc: Nancy Yuen Cc: Brendan Higgins Signed-off-by: Guenter Roeck --- drivers/hwmon/npcm750-pwm-fan.c | 70 +++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 44 deletions(-) diff --git a/drivers/hwmon/npcm750-pwm-fan.c b/drivers/hwmon/npcm750-pwm-fan.c index b3b907bdfb63..1dc0cd452498 100644 --- a/drivers/hwmon/npcm750-pwm-fan.c +++ b/drivers/hwmon/npcm750-pwm-fan.c @@ -629,51 +629,33 @@ static umode_t npcm7xx_is_visible(const void *data, } } -static const u32 npcm7xx_pwm_config[] = { - HWMON_PWM_INPUT, - HWMON_PWM_INPUT, - HWMON_PWM_INPUT, - HWMON_PWM_INPUT, - HWMON_PWM_INPUT, - HWMON_PWM_INPUT, - HWMON_PWM_INPUT, - HWMON_PWM_INPUT, - 0 -}; - -static const struct hwmon_channel_info npcm7xx_pwm = { - .type = hwmon_pwm, - .config = npcm7xx_pwm_config, -}; - -static const u32 npcm7xx_fan_config[] = { - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - HWMON_F_INPUT, - 0 -}; - -static const struct hwmon_channel_info npcm7xx_fan = { - .type = hwmon_fan, - .config = npcm7xx_fan_config, -}; - static const struct hwmon_channel_info *npcm7xx_info[] = { - &npcm7xx_pwm, - &npcm7xx_fan, + HWMON_CHANNEL_INFO(pwm, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT), + HWMON_CHANNEL_INFO(fan, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT, + HWMON_F_INPUT), NULL }; From patchwork Mon Apr 1 16:19:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880251 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E91AF13B5 for ; Mon, 1 Apr 2019 16:20:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9B452885E for ; Mon, 1 Apr 2019 16:20:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9D3328857; Mon, 1 Apr 2019 16:20:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49F67287C2 for ; Mon, 1 Apr 2019 16:20:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728038AbfDAQUF (ORCPT ); Mon, 1 Apr 2019 12:20:05 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:40679 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728007AbfDAQUE (ORCPT ); Mon, 1 Apr 2019 12:20:04 -0400 Received: by mail-pl1-f196.google.com with SMTP id b3so1749527plr.7 for ; Mon, 01 Apr 2019 09:20:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=2QuFrhoco3K1APxoFuVBJuXPknA98BsFcrMQ+DYi7DA=; b=W6+k0Rr3uM9j4D/6cYIanBCKxy3kQY/aYqKMOQtZelMAYNn7Q/XoPh7+Lh+SQYm0e3 gLudjeFgtD7DNlDhrbWAVpmDzUg+R/F2uDWo/2urn7jisGVdwQTLwOOv+Zh0Npx01Cx8 0f711TW5TEya7HJK6979BtcplsdJHgeL4eein4YvSud/hs8UUn0t8tI/MD1U6T0MLbRG wxXrd4OLmtbdONqTU6w4gLqTCWQoJZ91ycaVboyHEEiQG9N7xtDk4+X3A6QabBWGOHhh Me1usuopNB0B39C663fSYV+m0shFHAIQF+5C1YnEGuAK2M+stHjSGIsEOmFM4C/WrNBR xpjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=2QuFrhoco3K1APxoFuVBJuXPknA98BsFcrMQ+DYi7DA=; b=rFWiKE2F/pT5fECEMNZvxivBSkrHT4ZTqJtTYM5wQZQJBvibQEGrtbF/O/r4U0y6ox Ai3yvH8oWhlaEeGxt5JuCLzvOUovUmn0t1l7FHHJVEV1m4dO9BVd91mwajBVxTKAMnBl KBsuDWS1UnuV7tQpTot4EHwc/uOX6rj1miPaHYZh+ilJZWxIiGAmWehPtNLcxLkqxKLn kofOC8Kx1oM8hwaBvfoDRSut4ZNm6/aqsM9pUSCOwYG9KZCHzAOTVlg0/hqPHOyWnfXx L0fFx1wUe+iiFobSyPwFcsYUUXN1D4NajNvYM3sWWe0MCWMdj2WXSxMALIYCJcos3ZsV kAEg== X-Gm-Message-State: APjAAAXerRHDlpyS0rJDrHWlQpRCC1wcXUZ67HhZgDQGlwZO2ojv6w6j zL1XE4FdhgiXdDA+qnXxe939nsFr X-Google-Smtp-Source: APXvYqxSnTUL1SBxfFzV7rQvhJLPCiTDalq4/qQV/lpbmigL0kTLvJyfE1lDLRHpVG7MUFZfBCI87A== X-Received: by 2002:a17:902:396a:: with SMTP id e39mr43130761plg.220.1554135603835; Mon, 01 Apr 2019 09:20:03 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id i79sm21741524pfj.28.2019.04.01.09.20.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:20:03 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 14/17] hwmon: (raspberrypi-hwmon) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:34 -0700 Message-Id: <1554135577-11889-15-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/raspberrypi-hwmon.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c index 0d0457245e7d..efe4bb1ff221 100644 --- a/drivers/hwmon/raspberrypi-hwmon.c +++ b/drivers/hwmon/raspberrypi-hwmon.c @@ -86,18 +86,9 @@ static umode_t rpi_is_visible(const void *_data, enum hwmon_sensor_types type, return 0444; } -static const u32 rpi_in_config[] = { - HWMON_I_LCRIT_ALARM, - 0 -}; - -static const struct hwmon_channel_info rpi_in = { - .type = hwmon_in, - .config = rpi_in_config, -}; - static const struct hwmon_channel_info *rpi_info[] = { - &rpi_in, + HWMON_CHANNEL_INFO(in, + HWMON_I_LCRIT_ALARM), NULL }; From patchwork Mon Apr 1 16:19:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880253 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 338E818E8 for ; Mon, 1 Apr 2019 16:20:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E29026E75 for ; Mon, 1 Apr 2019 16:20:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 119FF28864; Mon, 1 Apr 2019 16:20:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C2F0287D3 for ; Mon, 1 Apr 2019 16:20:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728641AbfDAQUG (ORCPT ); Mon, 1 Apr 2019 12:20:06 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:44323 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728007AbfDAQUG (ORCPT ); Mon, 1 Apr 2019 12:20:06 -0400 Received: by mail-pl1-f193.google.com with SMTP id g12so4723521pll.11 for ; Mon, 01 Apr 2019 09:20:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=JbHBzg8jP21Ou9WDXO18Q1Bjkcg12SWxcVYR4Mt5cwk=; b=GSjjYJ0b3xlr4ZA/Sc/kcZ7pCSc/vUzoDAENoXm/z4gC2sRJvsypWJvBOPJ4sMiDTt P2Aqzx2VySxckM7wHSBhHv+9uD5vZfot6T5r9aBKS49o+nTDDkicioa0lquY/P/Yum2a rXjZjZMfHu8U9k197G+OYNOLbxYRtQ1ok6sI1sMVmNwnt3ZyI75uCWYzg9B8xYRDJJdI myGhUVQS3W6RAx4p5/ybVXR4V/EpxeWqlyVb36e4lylr5qcG5SRxpZUS5DPGgwvDVnj9 QeQQ8U8oNx5CX1o/dLcwwTzo9H0PEtluvxqVfHSfKN+MhNe4Zw9gIBGixLO+ovrjRiMy VopQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=JbHBzg8jP21Ou9WDXO18Q1Bjkcg12SWxcVYR4Mt5cwk=; b=Aikzmc5ba1fKriGUT8e3DIh8Xq0hlXPCz3WX5jbanUom/Ree+64cpd2/3M2h3k1Rak t+kwvxafLU8edGGyprVwE8pkxBdBVkYgHU0jlKNyYBglzXQ3WEU9WNCiSuSV8ZVdrag4 ZKJu6Sr+K61YdrBipVhejR4hwlfUblyFVMFip6sf/vBLp8eSNt90AOxCfBpT4wRF2jyw aRLS+0D27h33TpYkYG02yzrYWf5n6tW/89kXXQimmjdhmJT9p1Z+IAJvXWArlyLjtQ/b PtqyUUJlvB3S6qKsrNL5zMThLVeQpjtGeoKGo6uMKgIHLlZGjWwRrK2SCsTL3sfRMJWX RTFA== X-Gm-Message-State: APjAAAX4ogjEIBKHMzWg2YIGAgb5Tedl/SGiR0jE+eUV3d3Q0hDaGTD/ 28Vvwlahe1G6FTNB5Pz1I4aXaU7M X-Google-Smtp-Source: APXvYqzx/AkZe77nUQ94gbZ7M7d9jw1z6Yv7UghrYWnGp+n0x7/qEx8//x7+CR0oF6r2/8nytv+1TQ== X-Received: by 2002:a17:902:e90b:: with SMTP id cs11mr6350971plb.243.1554135605277; Mon, 01 Apr 2019 09:20:05 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id i1sm23223912pgc.63.2019.04.01.09.20.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:20:04 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 15/17] hwmon: (tmp102) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:35 -0700 Message-Id: <1554135577-11889-16-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/tmp102.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index 35523d315f25..213564aad005 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c @@ -150,29 +150,11 @@ static umode_t tmp102_is_visible(const void *data, enum hwmon_sensor_types type, } } -static u32 tmp102_chip_config[] = { - HWMON_C_REGISTER_TZ, - 0 -}; - -static const struct hwmon_channel_info tmp102_chip = { - .type = hwmon_chip, - .config = tmp102_chip_config, -}; - -static u32 tmp102_temp_config[] = { - HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST, - 0 -}; - -static const struct hwmon_channel_info tmp102_temp = { - .type = hwmon_temp, - .config = tmp102_temp_config, -}; - static const struct hwmon_channel_info *tmp102_info[] = { - &tmp102_chip, - &tmp102_temp, + HWMON_CHANNEL_INFO(chip, + HWMON_C_REGISTER_TZ), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST), NULL }; From patchwork Mon Apr 1 16:19:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880255 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 472181908 for ; Mon, 1 Apr 2019 16:20:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 306182881B for ; Mon, 1 Apr 2019 16:20:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2452028869; Mon, 1 Apr 2019 16:20:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 204BE2881B for ; Mon, 1 Apr 2019 16:20:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728040AbfDAQUH (ORCPT ); Mon, 1 Apr 2019 12:20:07 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:44420 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728007AbfDAQUH (ORCPT ); Mon, 1 Apr 2019 12:20:07 -0400 Received: by mail-pf1-f196.google.com with SMTP id y13so4806444pfm.11 for ; Mon, 01 Apr 2019 09:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=MR/TKnVL50MPfOUwfeH5b7w0uUtvHuJLwsuvoLJ7iuo=; b=ZqoCc29lagxUPZnkrNKaD3jxnR6FnhQSGL2TEm6HOPuWvGIKLF0aKzalq4o3sk71qT Slyc6U7t7BcnelrYSzqpf01lbOga7UwNhcwYjVTZFHDODYlFrPe4OM8lYiRGpOf6oHaG 4ckXlcMWgpHQULV08bjNxnjiDuVc8ny5XBKg+us8biWFJ6LuDepyaClJ/wWalTmvuOPP i0QdV+TE7XU6rn140wawbXTxlYgPXkAzILcCfu8lbvryG2VkvPvxDCVeoCK04FSxCETy dSj05sv+FgkoA/P1CJcQXdOhku1qkEbWSHcnsOSAc32w0lU/E6JINP0fd0q9l1SsTHYh eE4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=MR/TKnVL50MPfOUwfeH5b7w0uUtvHuJLwsuvoLJ7iuo=; b=R4INAhtqcImUAUAWGStt9Q3DGrh+RysVVl8a4Cgv3H5lZsGwC6vOWEsVeLTs/s7ft+ 6WovetPcXBdzDlweJKdl6M6rg61a18PGZRFwchYjEjuZPXXB/wpwjI+N0bc0patAmsq+ erQGKtaaq8iU2GFf3Hkga5GFC5lfyh8TlznI/YlHn0fe1m8PZYmkwf20cj/GdllN8aQN WssCBNe1ptFUi9KT7PWv8oWRaJBcUsIKMng0RDTMpSg3/uJCfHOHS/qg5c20rwMWB+CH iB7Eph7zPqBQn6ZVNNgxEw/O5O9233joR+3XWmEB9LYtdzJ8m3YTDWcOogP08a2YCizf aXDA== X-Gm-Message-State: APjAAAV01kiTcQM+rHxquDfWWoGiqOAglMyjVexumg+JCpzMR45wYrC/ 5fhRU/Az1pFWPUi79Qgp3DK/ZRq6 X-Google-Smtp-Source: APXvYqxMqT6dPn8xhp0ABkxqp2dbPn8pekIBMO6CGLzshVQZC9pOAjHkoitqRxtA/bcIIIaQdKhDjA== X-Received: by 2002:a63:4e4e:: with SMTP id o14mr62448208pgl.254.1554135606770; Mon, 01 Apr 2019 09:20:06 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id a17sm9481456pgd.30.2019.04.01.09.20.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:20:06 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 16/17] hwmon: (tmp108) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:36 -0700 Message-Id: <1554135577-11889-17-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/tmp108.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/drivers/hwmon/tmp108.c b/drivers/hwmon/tmp108.c index 429bfeae4ca8..2447af704424 100644 --- a/drivers/hwmon/tmp108.c +++ b/drivers/hwmon/tmp108.c @@ -281,30 +281,13 @@ static umode_t tmp108_is_visible(const void *data, enum hwmon_sensor_types type, } } -static u32 tmp108_chip_config[] = { - HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL, - 0 -}; - -static const struct hwmon_channel_info tmp108_chip = { - .type = hwmon_chip, - .config = tmp108_chip_config, -}; - -static u32 tmp108_temp_config[] = { - HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN | HWMON_T_MIN_HYST - | HWMON_T_MAX_HYST | HWMON_T_MIN_ALARM | HWMON_T_MAX_ALARM, - 0 -}; - -static const struct hwmon_channel_info tmp108_temp = { - .type = hwmon_temp, - .config = tmp108_temp_config, -}; - static const struct hwmon_channel_info *tmp108_info[] = { - &tmp108_chip, - &tmp108_temp, + HWMON_CHANNEL_INFO(chip, + HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN | + HWMON_T_MIN_HYST | HWMON_T_MAX_HYST | + HWMON_T_MIN_ALARM | HWMON_T_MAX_ALARM), NULL }; From patchwork Mon Apr 1 16:19:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10880257 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DF6317E1 for ; Mon, 1 Apr 2019 16:20:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84C3A287D3 for ; Mon, 1 Apr 2019 16:20:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7852D2881B; Mon, 1 Apr 2019 16:20:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7366D28826 for ; Mon, 1 Apr 2019 16:20:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728645AbfDAQUJ (ORCPT ); Mon, 1 Apr 2019 12:20:09 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:34062 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728007AbfDAQUJ (ORCPT ); Mon, 1 Apr 2019 12:20:09 -0400 Received: by mail-pf1-f195.google.com with SMTP id b3so4826329pfd.1 for ; Mon, 01 Apr 2019 09:20:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=HZhQJdFYJpn9QjzLHWBY8wUbt3gFrLZ/pDAMURPA6KY=; b=Yfu5U2UjJGmcWr9/cGDKndprGsFGprwrekUgrwzVhjCkjn/BNrI+YpOvJmWiYOzzbH RjNQxYgO0pXK3gqUfeCkjU8h5v9akSqrem6BWINuYNumNQhv43AhYsHkT7tGSMvueko9 eHelbmJTby08YrMvP1P0m7gVnZvqGxOyuesIXUzTRmsBr0bySJKoa31sk+OyQLBqj2/+ R7YPBZQ95KOV+C1CQGfJc/fIBp98p1KZAoB+u9i6QTqAA3qRlwfWXGeQnim+PHNJJ8c6 XE8Eo/qgme6PqKDMuZWslAf90AR2B3ORIgpW4zd88eil0e9HYDzh2KtayNRSgL6JOfeR pyZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=HZhQJdFYJpn9QjzLHWBY8wUbt3gFrLZ/pDAMURPA6KY=; b=G0iyi646SYCWfWQGz7V5cZFDnrP7TqsiK/jql1YYESyKe8BZWI49zH2m5rrpU2Tpa+ 1dUbuJqf7ETrNQ3VFC91gKoPIv4f+k8WXAy1g1+dUGWui6uXji379RVeNG/D5duoCxVy NhwPTy+tanmvhItW7aPE7wDpPSt0QDqa+xhb+IYGKGuaAeNDr/zg9o/ZkpAXdhrS/I9y 5XyEOmx+EHxV/rxv0N2NGcxPw7YwpqQCnsSJtWWCwrOhV9XvV/bmUuP8tn/iZAG57aUa ljJqOsUkImIZzb0im9YaJpql7cap0DtXbDmeBIKUFMpGIsqcP4KacRgfl5CKiA2d8pue UoMg== X-Gm-Message-State: APjAAAUrm+09GOMkEXxOdgW5HqbaqpUUAzPoIMavgLPHYH1FG/Ue7Exg 0rIcYE70ZCeqr6tVsc6I5Hd4JihQ X-Google-Smtp-Source: APXvYqzsGOfnvQhcbrcXkKF4MZSPWoEi4+BDM1UtTVOlM8TrFeI/UI3GPTAJqRn/jEYJy8KPiUh1jw== X-Received: by 2002:a63:4a5a:: with SMTP id j26mr51866310pgl.361.1554135608159; Mon, 01 Apr 2019 09:20:08 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id f65sm16276756pff.21.2019.04.01.09.20.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 09:20:07 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 17/17] hwmon: (w83773g) Use HWMON_CHANNEL_INFO macro Date: Mon, 1 Apr 2019 09:19:37 -0700 Message-Id: <1554135577-11889-18-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net> References: <1554135577-11889-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. @r@ initializer list elements; identifier i; @@ -u32 i[] = { - elements, - 0 -}; @s@ identifier r.i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @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 semantic patch. Signed-off-by: Guenter Roeck --- drivers/hwmon/w83773g.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/drivers/hwmon/w83773g.c b/drivers/hwmon/w83773g.c index e858093ac806..1f34d885db52 100644 --- a/drivers/hwmon/w83773g.c +++ b/drivers/hwmon/w83773g.c @@ -237,31 +237,13 @@ static umode_t w83773_is_visible(const void *data, enum hwmon_sensor_types type, return 0; } -static const u32 w83773_chip_config[] = { - HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL, - 0 -}; - -static const struct hwmon_channel_info w83773_chip = { - .type = hwmon_chip, - .config = w83773_chip_config, -}; - -static const u32 w83773_temp_config[] = { - HWMON_T_INPUT, - HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET, - HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET, - 0 -}; - -static const struct hwmon_channel_info w83773_temp = { - .type = hwmon_temp, - .config = w83773_temp_config, -}; - static const struct hwmon_channel_info *w83773_info[] = { - &w83773_chip, - &w83773_temp, + HWMON_CHANNEL_INFO(chip, + HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT, + HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET, + HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET), NULL };