From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754531AbbL3KGl (ORCPT ); Wed, 30 Dec 2015 05:06:41 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:35315 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754312AbbL3KGi (ORCPT ); Wed, 30 Dec 2015 05:06:38 -0500 X-AuditID: cbfee690-f79646d000001316-60-5683acac603f Message-id: <5683ACB6.8040004@samsung.com> Date: Wed, 30 Dec 2015 15:36:46 +0530 From: Alim Akhtar User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-version: 1.0 To: Krzysztof Kozlowski , Sangbeom Kim , Alessandro Zummo , Alexandre Belloni , Lee Jones , linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, rtc-linux@googlegroups.com Cc: Yadwinder Singh Brar Subject: Re: [PATCH v2 1/3] rtc: s5m: Cleanup by removing useless 'rtc' prefix from fields References: <1451450847-928-1-git-send-email-k.kozlowski@samsung.com> In-reply-to: <1451450847-928-1-git-send-email-k.kozlowski@samsung.com> Content-type: text/plain; charset=ISO-8859-1; format=flowed Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKIsWRmVeSWpSXmKPExsWyRsSkWnfNmuYwg58rLSyWXLzKbtFxbTGT xesXhhb3vx5ltLi8aw6bxYzz+5gs9nd2MFpcXPGFyWLu70ZWB06PJ5suMnrsnHWX3WPPxJNs Hneu7WHz6NuyitFj+ryfTB6fN8kFsEdx2aSk5mSWpRbp2yVwZSx/MIm5YKpexb4rq5kaGNer dDFyckgImEi09jQxQthiEhfurWfrYuTiEBJYwSixu/8lI0zR0QXXmCASsxglGpZvY4VwHjBK vJ/4mqWLkYODV0BL4vn+GJAGFgFViUvL1rKB2GwC2hJ3p29hAikRFYiQeHxBCCTMKyAo8WPy PRaQMSIC+5kkVix9zQ6SYBYwkHhw5inYYmGBGIn+t/OYQWwhAVeJM5f7mUHmcAq4SZyd4glR bi2xctI2RghbXmLzmrfMIDMlBL6yS1zd+YgJ4h4BiW+TD4GdKSEgK7HpADPEX5ISB1fcYJnA KDYLyUmzkIydhWTsAkbmVYyiqQXJBcVJ6UUmesWJucWleel6yfm5mxiBsXn637MJOxjvHbA+ xCjAwajEw3tCqDlMiDWxrLgy9xCjKdAVE5mlRJPzgQkgryTe0NjMyMLUxNTYyNzSTEmc97XU z2AhgfTEktTs1NSC1KL4otKc1OJDjEwcnFINjB0/2w7MdS7N3MOvLMKRMf+yu8K3iSYhj1ee /qT7STX+38Y/y87Jb1b/lXrGIWJp+Wn9fWyeNsYqng9+8wXt3+jwUejBjqiUpwodj5ucDi1a b/h93R07h0c/T3Px+SUzh9W42WxqMZ8unORaPVNcYVqKmYvNIe/GCHvBNzzCLGyzm5N3nHwa q8RSnJFoqMVcVJwIAAOGBwDIAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42I5/e+xoO6aNc1hBn1PDCyWXLzKbtFxbTGT xesXhhb3vx5ltLi8aw6bxYzz+5gs9nd2MFpcXPGFyWLu70ZWB06PJ5suMnrsnHWX3WPPxJNs Hneu7WHz6NuyitFj+ryfTB6fN8kFsEc1MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoa WlqYKynkJeam2iq5+AToumXmAJ2mpFCWmFMKFApILC5W0rfDNCE0xE3XAqYxQtc3JAiux8gA DSSsYcxY/mASc8FUvYp9V1YzNTCuV+li5OSQEDCROLrgGhOELSZx4d56ti5GLg4hgVmMEg3L t7FCOA8YJd5PfM3SxcjBwSugJfF8fwxIA4uAqsSlZWvZQGw2AW2Ju9O3MIGUiApESDy+IAQS 5hUQlPgx+R4LyBgRgf1MEiuWvmYHSTALGEg8OPOUEcQWFoiR6H87jxnEFhJwlThzuZ8ZZA6n gJvE2SmeEOXWEisnbWOEsOUlNq95yzyBEehIhBWzkJTNQlK2gJF5FaNEakFyQXFSeq5RXmq5 XnFibnFpXrpecn7uJkZw/D+T3sF4eJf7IUYBDkYlHt4TQs1hQqyJZcWVuYcYJTiYlUR4P9YB hXhTEiurUovy44tKc1KLDzGaAsNgIrOUaHI+MDXllcQbGpuYmxqbWppYmJhZKonz7rsUGSYk kJ5YkpqdmlqQWgTTx8TBKdXAyJy85TQvb3muwtx18uu0w+dKLcq2tvFQe5O/O1nkx6Hn34SW blhieWb21MdC/f9kziXL5TcbJIbP2pyjpr7w31nZnN0dH/aauW/OLJY6PJHt9T+ZnHey793d 387iCBIXU7m9oY5vUcTCTZsKSr54TUzJel42S5T9Y9D3F5FNOqvinzbM1DYtUmIpzkg01GIu Kk4EAHNUw+sVAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Krzysztof, On 12/30/2015 10:17 AM, Krzysztof Kozlowski wrote: > Remove the 'rtc' prefix from some of the fields in struct > s5m_rtc_reg_config because it is obvious - this is a RTC driver. No > functional changes. > > Signed-off-by: Krzysztof Kozlowski > Looks good. Tested for s2mps15 pmic on exynos7-espresso board. Works well as before. Fill free to add Reviewed-by: Alim Akhtar Tested-by: Alim Akhtar > --- > > Changes since v1: > 1. None. > --- > drivers/rtc/rtc-s5m.c | 40 +++++++++++++++++++--------------------- > 1 file changed, 19 insertions(+), 21 deletions(-) > > diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c > index 0d68a85dd429..85649861a6b0 100644 > --- a/drivers/rtc/rtc-s5m.c > +++ b/drivers/rtc/rtc-s5m.c > @@ -55,9 +55,9 @@ struct s5m_rtc_reg_config { > * will enable update of time or alarm register. Then it will be > * auto-cleared after successful update. > */ > - unsigned int rtc_udr_update; > - /* Mask for UDR field in 'rtc_udr_update' register */ > - unsigned int rtc_udr_mask; > + unsigned int udr_update; > + /* Mask for UDR field in 'udr_update' register */ > + unsigned int udr_mask; > }; > > /* Register map for S5M8763 and S5M8767 */ > @@ -67,8 +67,8 @@ static const struct s5m_rtc_reg_config s5m_rtc_regs = { > .ctrl = S5M_ALARM1_CONF, > .alarm0 = S5M_ALARM0_SEC, > .alarm1 = S5M_ALARM1_SEC, > - .rtc_udr_update = S5M_RTC_UDR_CON, > - .rtc_udr_mask = S5M_RTC_UDR_MASK, > + .udr_update = S5M_RTC_UDR_CON, > + .udr_mask = S5M_RTC_UDR_MASK, > }; > > /* > @@ -81,8 +81,8 @@ static const struct s5m_rtc_reg_config s2mps_rtc_regs = { > .ctrl = S2MPS_RTC_CTRL, > .alarm0 = S2MPS_ALARM0_SEC, > .alarm1 = S2MPS_ALARM1_SEC, > - .rtc_udr_update = S2MPS_RTC_UDR_CON, > - .rtc_udr_mask = S2MPS_RTC_WUDR_MASK, > + .udr_update = S2MPS_RTC_UDR_CON, > + .udr_mask = S2MPS_RTC_WUDR_MASK, > }; > > struct s5m_rtc_info { > @@ -166,9 +166,8 @@ static inline int s5m8767_wait_for_udr_update(struct s5m_rtc_info *info) > unsigned int data; > > do { > - ret = regmap_read(info->regmap, info->regs->rtc_udr_update, > - &data); > - } while (--retry && (data & info->regs->rtc_udr_mask) && !ret); > + ret = regmap_read(info->regmap, info->regs->udr_update, &data); > + } while (--retry && (data & info->regs->udr_mask) && !ret); > > if (!retry) > dev_err(info->dev, "waiting for UDR update, reached max number of retries\n"); > @@ -214,7 +213,7 @@ static inline int s5m8767_rtc_set_time_reg(struct s5m_rtc_info *info) > int ret; > unsigned int data; > > - ret = regmap_read(info->regmap, info->regs->rtc_udr_update, &data); > + ret = regmap_read(info->regmap, info->regs->udr_update, &data); > if (ret < 0) { > dev_err(info->dev, "failed to read update reg(%d)\n", ret); > return ret; > @@ -223,21 +222,20 @@ static inline int s5m8767_rtc_set_time_reg(struct s5m_rtc_info *info) > switch (info->device_type) { > case S5M8763X: > case S5M8767X: > - data |= info->regs->rtc_udr_mask | S5M_RTC_TIME_EN_MASK; > + data |= info->regs->udr_mask | S5M_RTC_TIME_EN_MASK; > case S2MPS15X: > /* As per UM, for write time register, set WUDR bit to high */ > data |= S2MPS15_RTC_WUDR_MASK; > break; > case S2MPS14X: > case S2MPS13X: > - data |= info->regs->rtc_udr_mask; > + data |= info->regs->udr_mask; > break; > default: > return -EINVAL; > } > > - > - ret = regmap_write(info->regmap, info->regs->rtc_udr_update, data); > + ret = regmap_write(info->regmap, info->regs->udr_update, data); > if (ret < 0) { > dev_err(info->dev, "failed to write update reg(%d)\n", ret); > return ret; > @@ -253,14 +251,14 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info) > int ret; > unsigned int data; > > - ret = regmap_read(info->regmap, info->regs->rtc_udr_update, &data); > + ret = regmap_read(info->regmap, info->regs->udr_update, &data); > if (ret < 0) { > dev_err(info->dev, "%s: fail to read update reg(%d)\n", > __func__, ret); > return ret; > } > > - data |= info->regs->rtc_udr_mask; > + data |= info->regs->udr_mask; > switch (info->device_type) { > case S5M8763X: > case S5M8767X: > @@ -268,7 +266,7 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info) > break; > case S2MPS15X: > /* As per UM, for write alarm, set A_UDR(bit[4]) to high > - * rtc_udr_mask above sets bit[4] > + * udr_mask above sets bit[4] > */ > break; > case S2MPS14X: > @@ -281,7 +279,7 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info) > return -EINVAL; > } > > - ret = regmap_write(info->regmap, info->regs->rtc_udr_update, data); > + ret = regmap_write(info->regmap, info->regs->udr_update, data); > if (ret < 0) { > dev_err(info->dev, "%s: fail to write update reg(%d)\n", > __func__, ret); > @@ -292,7 +290,7 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info) > > /* On S2MPS13 the AUDR is not auto-cleared */ > if (info->device_type == S2MPS13X) > - regmap_update_bits(info->regmap, info->regs->rtc_udr_update, > + regmap_update_bits(info->regmap, info->regs->udr_update, > S2MPS13_RTC_AUDR_MASK, 0); > > return ret; > @@ -339,7 +337,7 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm) > if (info->device_type == S2MPS15X || info->device_type == S2MPS14X || > info->device_type == S2MPS13X) { > ret = regmap_update_bits(info->regmap, > - info->regs->rtc_udr_update, > + info->regs->udr_update, > S2MPS_RTC_RUDR_MASK, S2MPS_RTC_RUDR_MASK); > if (ret) { > dev_err(dev, >