From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 861B0C433ED for ; Thu, 15 Apr 2021 15:22:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 585766115B for ; Thu, 15 Apr 2021 15:22:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233693AbhDOPXQ (ORCPT ); Thu, 15 Apr 2021 11:23:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230056AbhDOPXJ (ORCPT ); Thu, 15 Apr 2021 11:23:09 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1868AC061763; Thu, 15 Apr 2021 08:22:29 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id m11so16275742pfc.11; Thu, 15 Apr 2021 08:22:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=KeyNQXu5k1WcSi/sCV5YjYCFaXcfl6MiYmA9s7O/mBo=; b=EJIG1t79acVdqfeCyYbUA6NhQPSt5iki+x4WWtfinUJZ0GRBDm0dH6G2snnbYj1yj3 s64tqrzAA1YQzQPPyQSrzGwOiwRtJUcjXKIMm+4VZdzuunEJJXYmLhBrAmM43lxCg18Z ODswvJHIEk8fy1S7Buulxno8LJV7DKquV3mzWE2/se1YfIx3NKDOhAlmwtYuNcMiyZBV +bANzRuBclS3xYNBPweAQVgUr0O8tDgow/+QpiPgB8z7Ae7gtVgQSYOujhrj8P+nranR 595F+/kFrybNTTX5ecURb/T2aeHG8bHcnWIjg8uywSGM5Kah09ZPp6x9o0Inyog9dHIB RQAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=KeyNQXu5k1WcSi/sCV5YjYCFaXcfl6MiYmA9s7O/mBo=; b=m13EyOHkuvWZF1+6K8U4DI8Xw8EDOCykEchqxM1ij3J6TfvEEapWYNm/I+c32I/dwe 4ssDyXFx3VpzGBdAP6wTw6b56QT6A5gfkc7XWTPwa0NZWl11YCdlSwBnk3AIkaEt6CIv 3Fco51y9AqFJqd3CvPInI3FVDKIUy9z/qU9m0+tSWQi5WAs7pulEZFAD2psHOiKyPbe2 YU3jeUezAQRrXeAF4ffWYhvrQA7bW161ZpAwJzKCHAX2iNjfIN3BsuOR7F1j57h1UuwI syB1+9EDyy7MSL69Utk1cp8CyErWMVj5wAFMBDND+gOT1JEIG63fw/2AI9ZTdDzJbaKU mIXA== X-Gm-Message-State: AOAM531CkdLPMU88MbQc+9uwnSbQkuI4xCNo4ru756xGtM28XGlzksAb J9AIHL4QrGlUhKqWqwhYUgg= X-Google-Smtp-Source: ABdhPJx421x0Re/0xlsMakSxbsTUjmNg0DQme16Jf+WeTp2Lt/prUJYMYWdZ5HOatRjI/+eUQP93/w== X-Received: by 2002:aa7:9a92:0:b029:24b:f852:34d8 with SMTP id w18-20020aa79a920000b029024bf85234d8mr3719219pfi.4.1618500148604; Thu, 15 Apr 2021 08:22:28 -0700 (PDT) Received: from syed ([2401:4900:2eec:4193:f802:b600:e94c:55c4]) by smtp.gmail.com with ESMTPSA id 144sm2414075pfy.75.2021.04.15.08.22.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Apr 2021 08:22:28 -0700 (PDT) Date: Thu, 15 Apr 2021 20:52:17 +0530 From: Syed Nayyar Waris To: William Breathitt Gray Cc: jic23@kernel.org, kernel@pengutronix.de, linux-stm32@st-md-mailman.stormreply.com, a.fatoum@pengutronix.de, kamel.bouhara@bootlin.com, gwendal@chromium.org, alexandre.belloni@bootlin.com, david@lechnology.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patrick.havelange@essensium.com, fabrice.gasnier@st.com, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, o.rempel@pengutronix.de Subject: Re: [PATCH v10 21/33] counter: Rename counter_count_function to counter_function Message-ID: <20210415152217.GJ8933@syed> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 19, 2021 at 08:00:40PM +0900, William Breathitt Gray wrote: > The phrase "Counter Count function" is verbose and unintentionally > implies that function is a Count extension. This patch adjusts the > Counter subsystem code to use the more direct "Counter function" phrase > to make the intent of this code clearer. > > Cc: Syed Nayyar Waris > Cc: Patrick Havelange > Cc: Oleksij Rempel > Cc: Kamel Bouhara > Cc: Fabrice Gasnier > Cc: Maxime Coquelin > Cc: Alexandre Torgue > Cc: David Lechner > Signed-off-by: William Breathitt Gray > --- > drivers/counter/104-quad-8.c | 10 +++---- For the 104-quad-8 driver: Acked-by: Syed Nayyar Waris > drivers/counter/counter.c | 38 ++++++++++++------------- > drivers/counter/ftm-quaddec.c | 5 ++-- > drivers/counter/interrupt-cnt.c | 4 +-- > drivers/counter/microchip-tcb-capture.c | 4 +-- > drivers/counter/stm32-lptimer-cnt.c | 6 ++-- > drivers/counter/stm32-timer-cnt.c | 10 +++---- > drivers/counter/ti-eqep.c | 10 +++---- > include/linux/counter.h | 20 ++++++------- > 9 files changed, 53 insertions(+), 54 deletions(-) > > diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c > index fb0f021c0751..5a49ace2d4a6 100644 > --- a/drivers/counter/104-quad-8.c > +++ b/drivers/counter/104-quad-8.c > @@ -194,11 +194,11 @@ enum quad8_count_function { > QUAD8_COUNT_FUNCTION_QUADRATURE_X4 > }; > > -static const enum counter_count_function quad8_count_functions_list[] = { > - [QUAD8_COUNT_FUNCTION_PULSE_DIRECTION] = COUNTER_COUNT_FUNCTION_PULSE_DIRECTION, > - [QUAD8_COUNT_FUNCTION_QUADRATURE_X1] = COUNTER_COUNT_FUNCTION_QUADRATURE_X1_A, > - [QUAD8_COUNT_FUNCTION_QUADRATURE_X2] = COUNTER_COUNT_FUNCTION_QUADRATURE_X2_A, > - [QUAD8_COUNT_FUNCTION_QUADRATURE_X4] = COUNTER_COUNT_FUNCTION_QUADRATURE_X4 > +static const enum counter_function quad8_count_functions_list[] = { > + [QUAD8_COUNT_FUNCTION_PULSE_DIRECTION] = COUNTER_FUNCTION_PULSE_DIRECTION, > + [QUAD8_COUNT_FUNCTION_QUADRATURE_X1] = COUNTER_FUNCTION_QUADRATURE_X1_A, > + [QUAD8_COUNT_FUNCTION_QUADRATURE_X2] = COUNTER_FUNCTION_QUADRATURE_X2_A, > + [QUAD8_COUNT_FUNCTION_QUADRATURE_X4] = COUNTER_FUNCTION_QUADRATURE_X4 > }; > > static int quad8_function_get(struct counter_device *counter, > diff --git a/drivers/counter/counter.c b/drivers/counter/counter.c > index cb92673552b5..de921e8a3f72 100644 > --- a/drivers/counter/counter.c > +++ b/drivers/counter/counter.c > @@ -744,15 +744,15 @@ static ssize_t counter_count_store(struct device *dev, > return len; > } > > -static const char *const counter_count_function_str[] = { > - [COUNTER_COUNT_FUNCTION_INCREASE] = "increase", > - [COUNTER_COUNT_FUNCTION_DECREASE] = "decrease", > - [COUNTER_COUNT_FUNCTION_PULSE_DIRECTION] = "pulse-direction", > - [COUNTER_COUNT_FUNCTION_QUADRATURE_X1_A] = "quadrature x1 a", > - [COUNTER_COUNT_FUNCTION_QUADRATURE_X1_B] = "quadrature x1 b", > - [COUNTER_COUNT_FUNCTION_QUADRATURE_X2_A] = "quadrature x2 a", > - [COUNTER_COUNT_FUNCTION_QUADRATURE_X2_B] = "quadrature x2 b", > - [COUNTER_COUNT_FUNCTION_QUADRATURE_X4] = "quadrature x4" > +static const char *const counter_function_str[] = { > + [COUNTER_FUNCTION_INCREASE] = "increase", > + [COUNTER_FUNCTION_DECREASE] = "decrease", > + [COUNTER_FUNCTION_PULSE_DIRECTION] = "pulse-direction", > + [COUNTER_FUNCTION_QUADRATURE_X1_A] = "quadrature x1 a", > + [COUNTER_FUNCTION_QUADRATURE_X1_B] = "quadrature x1 b", > + [COUNTER_FUNCTION_QUADRATURE_X2_A] = "quadrature x2 a", > + [COUNTER_FUNCTION_QUADRATURE_X2_B] = "quadrature x2 b", > + [COUNTER_FUNCTION_QUADRATURE_X4] = "quadrature x4" > }; > > static ssize_t counter_function_show(struct device *dev, > @@ -764,7 +764,7 @@ static ssize_t counter_function_show(struct device *dev, > const struct counter_count_unit *const component = devattr->component; > struct counter_count *const count = component->count; > size_t func_index; > - enum counter_count_function function; > + enum counter_function function; > > err = counter->ops->function_get(counter, count, &func_index); > if (err) > @@ -773,7 +773,7 @@ static ssize_t counter_function_show(struct device *dev, > count->function = func_index; > > function = count->functions_list[func_index]; > - return sprintf(buf, "%s\n", counter_count_function_str[function]); > + return sprintf(buf, "%s\n", counter_function_str[function]); > } > > static ssize_t counter_function_store(struct device *dev, > @@ -785,14 +785,14 @@ static ssize_t counter_function_store(struct device *dev, > struct counter_count *const count = component->count; > const size_t num_functions = count->num_functions; > size_t func_index; > - enum counter_count_function function; > + enum counter_function function; > int err; > struct counter_device *const counter = dev_get_drvdata(dev); > > /* Find requested Count function mode */ > for (func_index = 0; func_index < num_functions; func_index++) { > function = count->functions_list[func_index]; > - if (sysfs_streq(buf, counter_count_function_str[function])) > + if (sysfs_streq(buf, counter_function_str[function])) > break; > } > /* Return error if requested Count function mode not found */ > @@ -880,25 +880,25 @@ static int counter_count_ext_register( > } > > struct counter_func_avail_unit { > - const enum counter_count_function *functions_list; > + const enum counter_function *functions_list; > size_t num_functions; > }; > > -static ssize_t counter_count_function_available_show(struct device *dev, > +static ssize_t counter_function_available_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > const struct counter_device_attr *const devattr = to_counter_attr(attr); > const struct counter_func_avail_unit *const component = devattr->component; > - const enum counter_count_function *const func_list = component->functions_list; > + const enum counter_function *const func_list = component->functions_list; > const size_t num_functions = component->num_functions; > size_t i; > - enum counter_count_function function; > + enum counter_function function; > ssize_t len = 0; > > for (i = 0; i < num_functions; i++) { > function = func_list[i]; > len += sprintf(buf + len, "%s\n", > - counter_count_function_str[function]); > + counter_function_str[function]); > } > > return len; > @@ -968,7 +968,7 @@ static int counter_count_attributes_create( > parm.group = group; > parm.prefix = ""; > parm.name = "function_available"; > - parm.show = counter_count_function_available_show; > + parm.show = counter_function_available_show; > parm.store = NULL; > parm.component = avail_comp; > err = counter_attribute_create(&parm); > diff --git a/drivers/counter/ftm-quaddec.c b/drivers/counter/ftm-quaddec.c > index 9371532406ca..53c15f84909b 100644 > --- a/drivers/counter/ftm-quaddec.c > +++ b/drivers/counter/ftm-quaddec.c > @@ -171,9 +171,8 @@ enum ftm_quaddec_count_function { > FTM_QUADDEC_COUNT_ENCODER_MODE_1, > }; > > -static const enum counter_count_function ftm_quaddec_count_functions[] = { > - [FTM_QUADDEC_COUNT_ENCODER_MODE_1] = > - COUNTER_COUNT_FUNCTION_QUADRATURE_X4 > +static const enum counter_function ftm_quaddec_count_functions[] = { > + [FTM_QUADDEC_COUNT_ENCODER_MODE_1] = COUNTER_FUNCTION_QUADRATURE_X4 > }; > > static int ftm_quaddec_count_read(struct counter_device *counter, > diff --git a/drivers/counter/interrupt-cnt.c b/drivers/counter/interrupt-cnt.c > index cce579c1c6ae..3dbb8acc67eb 100644 > --- a/drivers/counter/interrupt-cnt.c > +++ b/drivers/counter/interrupt-cnt.c > @@ -115,8 +115,8 @@ static int interrupt_cnt_write(struct counter_device *counter, > return 0; > } > > -static const enum counter_count_function interrupt_cnt_functions[] = { > - COUNTER_COUNT_FUNCTION_INCREASE, > +static const enum counter_function interrupt_cnt_functions[] = { > + COUNTER_FUNCTION_INCREASE, > }; > > static int interrupt_cnt_function_get(struct counter_device *counter, > diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c > index 6be3adf74114..4c57d43e7d66 100644 > --- a/drivers/counter/microchip-tcb-capture.c > +++ b/drivers/counter/microchip-tcb-capture.c > @@ -38,8 +38,8 @@ enum mchp_tc_count_function { > }; > > static const enum counter_count_function mchp_tc_count_functions[] = { > - [MCHP_TC_FUNCTION_INCREASE] = COUNTER_COUNT_FUNCTION_INCREASE, > - [MCHP_TC_FUNCTION_QUADRATURE] = COUNTER_COUNT_FUNCTION_QUADRATURE_X4, > + [MCHP_TC_FUNCTION_INCREASE] = COUNTER_FUNCTION_INCREASE, > + [MCHP_TC_FUNCTION_QUADRATURE] = COUNTER_FUNCTION_QUADRATURE_X4, > }; > > enum mchp_tc_synapse_action { > diff --git a/drivers/counter/stm32-lptimer-cnt.c b/drivers/counter/stm32-lptimer-cnt.c > index 49aeb9e393f3..13656957c45f 100644 > --- a/drivers/counter/stm32-lptimer-cnt.c > +++ b/drivers/counter/stm32-lptimer-cnt.c > @@ -134,9 +134,9 @@ enum stm32_lptim_cnt_function { > STM32_LPTIM_ENCODER_BOTH_EDGE, > }; > > -static const enum counter_count_function stm32_lptim_cnt_functions[] = { > - [STM32_LPTIM_COUNTER_INCREASE] = COUNTER_COUNT_FUNCTION_INCREASE, > - [STM32_LPTIM_ENCODER_BOTH_EDGE] = COUNTER_COUNT_FUNCTION_QUADRATURE_X4, > +static const enum counter_function stm32_lptim_cnt_functions[] = { > + [STM32_LPTIM_COUNTER_INCREASE] = COUNTER_FUNCTION_INCREASE, > + [STM32_LPTIM_ENCODER_BOTH_EDGE] = COUNTER_FUNCTION_QUADRATURE_X4, > }; > > enum stm32_lptim_synapse_action { > diff --git a/drivers/counter/stm32-timer-cnt.c b/drivers/counter/stm32-timer-cnt.c > index 603b30ada839..3fb0debd7425 100644 > --- a/drivers/counter/stm32-timer-cnt.c > +++ b/drivers/counter/stm32-timer-cnt.c > @@ -50,11 +50,11 @@ enum stm32_count_function { > STM32_COUNT_ENCODER_MODE_3, > }; > > -static const enum counter_count_function stm32_count_functions[] = { > - [STM32_COUNT_SLAVE_MODE_DISABLED] = COUNTER_COUNT_FUNCTION_INCREASE, > - [STM32_COUNT_ENCODER_MODE_1] = COUNTER_COUNT_FUNCTION_QUADRATURE_X2_A, > - [STM32_COUNT_ENCODER_MODE_2] = COUNTER_COUNT_FUNCTION_QUADRATURE_X2_B, > - [STM32_COUNT_ENCODER_MODE_3] = COUNTER_COUNT_FUNCTION_QUADRATURE_X4, > +static const enum counter_function stm32_count_functions[] = { > + [STM32_COUNT_SLAVE_MODE_DISABLED] = COUNTER_FUNCTION_INCREASE, > + [STM32_COUNT_ENCODER_MODE_1] = COUNTER_FUNCTION_QUADRATURE_X2_A, > + [STM32_COUNT_ENCODER_MODE_2] = COUNTER_FUNCTION_QUADRATURE_X2_B, > + [STM32_COUNT_ENCODER_MODE_3] = COUNTER_FUNCTION_QUADRATURE_X4, > }; > > static int stm32_count_read(struct counter_device *counter, > diff --git a/drivers/counter/ti-eqep.c b/drivers/counter/ti-eqep.c > index 878725c2f010..04be25ebf4a4 100644 > --- a/drivers/counter/ti-eqep.c > +++ b/drivers/counter/ti-eqep.c > @@ -284,11 +284,11 @@ static struct counter_signal ti_eqep_signals[] = { > }, > }; > > -static const enum counter_count_function ti_eqep_position_functions[] = { > - [TI_EQEP_COUNT_FUNC_QUAD_COUNT] = COUNTER_COUNT_FUNCTION_QUADRATURE_X4, > - [TI_EQEP_COUNT_FUNC_DIR_COUNT] = COUNTER_COUNT_FUNCTION_PULSE_DIRECTION, > - [TI_EQEP_COUNT_FUNC_UP_COUNT] = COUNTER_COUNT_FUNCTION_INCREASE, > - [TI_EQEP_COUNT_FUNC_DOWN_COUNT] = COUNTER_COUNT_FUNCTION_DECREASE, > +static const enum counter_function ti_eqep_position_functions[] = { > + [TI_EQEP_COUNT_FUNC_QUAD_COUNT] = COUNTER_FUNCTION_QUADRATURE_X4, > + [TI_EQEP_COUNT_FUNC_DIR_COUNT] = COUNTER_FUNCTION_PULSE_DIRECTION, > + [TI_EQEP_COUNT_FUNC_UP_COUNT] = COUNTER_FUNCTION_INCREASE, > + [TI_EQEP_COUNT_FUNC_DOWN_COUNT] = COUNTER_FUNCTION_DECREASE, > }; > > static const enum counter_synapse_action ti_eqep_position_synapse_actions[] = { > diff --git a/include/linux/counter.h b/include/linux/counter.h > index 79f5dcaf6ba0..d16ce2819b48 100644 > --- a/include/linux/counter.h > +++ b/include/linux/counter.h > @@ -162,15 +162,15 @@ struct counter_count_ext { > void *priv; > }; > > -enum counter_count_function { > - COUNTER_COUNT_FUNCTION_INCREASE = 0, > - COUNTER_COUNT_FUNCTION_DECREASE, > - COUNTER_COUNT_FUNCTION_PULSE_DIRECTION, > - COUNTER_COUNT_FUNCTION_QUADRATURE_X1_A, > - COUNTER_COUNT_FUNCTION_QUADRATURE_X1_B, > - COUNTER_COUNT_FUNCTION_QUADRATURE_X2_A, > - COUNTER_COUNT_FUNCTION_QUADRATURE_X2_B, > - COUNTER_COUNT_FUNCTION_QUADRATURE_X4 > +enum counter_function { > + COUNTER_FUNCTION_INCREASE = 0, > + COUNTER_FUNCTION_DECREASE, > + COUNTER_FUNCTION_PULSE_DIRECTION, > + COUNTER_FUNCTION_QUADRATURE_X1_A, > + COUNTER_FUNCTION_QUADRATURE_X1_B, > + COUNTER_FUNCTION_QUADRATURE_X2_A, > + COUNTER_FUNCTION_QUADRATURE_X2_B, > + COUNTER_FUNCTION_QUADRATURE_X4 > }; > > /** > @@ -192,7 +192,7 @@ struct counter_count { > const char *name; > > size_t function; > - const enum counter_count_function *functions_list; > + const enum counter_function *functions_list; > size_t num_functions; > > struct counter_synapse *synapses; > -- > 2.30.2 >