From: Laxman Dewangan <ldewangan@nvidia.com> To: <lee.jones@linaro.org>, <alexandre.belloni@free-electrons.com>, <k.kozlowski@samsung.com>, <javier@osg.samsung.com> Cc: <cw00.choi@samsung.com>, <linux-kernel@vger.kernel.org>, <rtc-linux@googlegroups.com>, Laxman Dewangan <ldewangan@nvidia.com> Subject: [PATCH V3 3/5] rtc: max77686: avoid reference of parent device info multiple places Date: Wed, 3 Feb 2016 19:17:11 +0530 [thread overview] Message-ID: <1454507233-9959-4-git-send-email-ldewangan@nvidia.com> (raw) In-Reply-To: <1454507233-9959-1-git-send-email-ldewangan@nvidia.com> Get rid of referring parent device info for register access all the places by making regmap as part of max77686 rtc device info. This will also remove the need of storing parent device info in max77686 rtc device info as this is no more required. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> CC: Krzysztof Kozlowski <k.kozlowski@samsung.com> CC: Javier Martinez Canillas <javier@osg.samsung.com> Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> --- Changes from V1: None, added reviewed/tested by. Changes form V2: - Fix typo in description. drivers/rtc/rtc-max77686.c | 52 ++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c index 11f74ed..ab1f2cd 100644 --- a/drivers/rtc/rtc-max77686.c +++ b/drivers/rtc/rtc-max77686.c @@ -74,12 +74,12 @@ struct max77686_rtc_driver_data { struct max77686_rtc_info { struct device *dev; - struct max77686_dev *max77686; struct i2c_client *rtc; struct rtc_device *rtc_dev; struct mutex lock; struct regmap *regmap; + struct regmap *rtc_regmap; const struct max77686_rtc_driver_data *drv_data; @@ -267,7 +267,7 @@ static int max77686_rtc_update(struct max77686_rtc_info *info, else data = 1 << RTC_RBUDR_SHIFT; - ret = regmap_update_bits(info->max77686->rtc_regmap, + ret = regmap_update_bits(info->rtc_regmap, info->drv_data->map[REG_RTC_UPDATE0], data, data); if (ret < 0) @@ -293,7 +293,7 @@ static int max77686_rtc_read_time(struct device *dev, struct rtc_time *tm) if (ret < 0) goto out; - ret = regmap_bulk_read(info->max77686->rtc_regmap, + ret = regmap_bulk_read(info->rtc_regmap, info->drv_data->map[REG_RTC_SEC], data, ARRAY_SIZE(data)); if (ret < 0) { @@ -322,7 +322,7 @@ static int max77686_rtc_set_time(struct device *dev, struct rtc_time *tm) mutex_lock(&info->lock); - ret = regmap_bulk_write(info->max77686->rtc_regmap, + ret = regmap_bulk_write(info->rtc_regmap, info->drv_data->map[REG_RTC_SEC], data, ARRAY_SIZE(data)); if (ret < 0) { @@ -351,8 +351,8 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) if (ret < 0) goto out; - ret = regmap_bulk_read(info->max77686->rtc_regmap, - map[REG_ALARM1_SEC], data, ARRAY_SIZE(data)); + ret = regmap_bulk_read(info->rtc_regmap, map[REG_ALARM1_SEC], + data, ARRAY_SIZE(data)); if (ret < 0) { dev_err(info->dev, "Fail to read alarm reg(%d)\n", ret); goto out; @@ -370,8 +370,7 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) goto out; } - ret = regmap_read(info->max77686->rtc_regmap, - map[REG_RTC_AE1], &val); + ret = regmap_read(info->rtc_regmap, map[REG_RTC_AE1], &val); if (ret < 0) { dev_err(info->dev, "fail to read alarm enable(%d)\n", ret); @@ -390,7 +389,7 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) } alrm->pending = 0; - ret = regmap_read(info->max77686->regmap, MAX77686_REG_STATUS2, &val); + ret = regmap_read(info->regmap, MAX77686_REG_STATUS2, &val); if (ret < 0) { dev_err(info->dev, "Fail to read status2 reg(%d)\n", ret); goto out; @@ -426,12 +425,10 @@ static int max77686_rtc_stop_alarm(struct max77686_rtc_info *info) goto out; } - ret = regmap_write(info->max77686->rtc_regmap, - map[REG_RTC_AE1], 0); + ret = regmap_write(info->rtc_regmap, map[REG_RTC_AE1], 0); } else { - ret = regmap_bulk_read(info->max77686->rtc_regmap, - map[REG_ALARM1_SEC], data, - ARRAY_SIZE(data)); + ret = regmap_bulk_read(info->rtc_regmap, map[REG_ALARM1_SEC], + data, ARRAY_SIZE(data)); if (ret < 0) { dev_err(info->dev, "Fail to read alarm reg(%d)\n", ret); goto out; @@ -442,9 +439,8 @@ static int max77686_rtc_stop_alarm(struct max77686_rtc_info *info) for (i = 0; i < ARRAY_SIZE(data); i++) data[i] &= ~ALARM_ENABLE_MASK; - ret = regmap_bulk_write(info->max77686->rtc_regmap, - map[REG_ALARM1_SEC], data, - ARRAY_SIZE(data)); + ret = regmap_bulk_write(info->rtc_regmap, map[REG_ALARM1_SEC], + data, ARRAY_SIZE(data)); } if (ret < 0) { @@ -472,12 +468,11 @@ static int max77686_rtc_start_alarm(struct max77686_rtc_info *info) goto out; if (info->drv_data->alarm_enable_reg) { - ret = regmap_write(info->max77686->rtc_regmap, map[REG_RTC_AE1], + ret = regmap_write(info->rtc_regmap, map[REG_RTC_AE1], MAX77802_ALARM_ENABLE_VALUE); } else { - ret = regmap_bulk_read(info->max77686->rtc_regmap, - map[REG_ALARM1_SEC], data, - ARRAY_SIZE(data)); + ret = regmap_bulk_read(info->rtc_regmap, map[REG_ALARM1_SEC], + data, ARRAY_SIZE(data)); if (ret < 0) { dev_err(info->dev, "Fail to read alarm reg(%d)\n", ret); goto out; @@ -496,9 +491,8 @@ static int max77686_rtc_start_alarm(struct max77686_rtc_info *info) if (data[RTC_DATE] & 0x1f) data[RTC_DATE] |= (1 << ALARM_ENABLE_SHIFT); - ret = regmap_bulk_write(info->max77686->rtc_regmap, - map[REG_ALARM1_SEC], data, - ARRAY_SIZE(data)); + ret = regmap_bulk_write(info->rtc_regmap, map[REG_ALARM1_SEC], + data, ARRAY_SIZE(data)); } if (ret < 0) { @@ -527,7 +521,7 @@ static int max77686_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) if (ret < 0) goto out; - ret = regmap_bulk_write(info->max77686->rtc_regmap, + ret = regmap_bulk_write(info->rtc_regmap, info->drv_data->map[REG_ALARM1_SEC], data, ARRAY_SIZE(data)); @@ -593,7 +587,7 @@ static int max77686_rtc_init_reg(struct max77686_rtc_info *info) info->rtc_24hr_mode = 1; - ret = regmap_bulk_write(info->max77686->rtc_regmap, + ret = regmap_bulk_write(info->rtc_regmap, info->drv_data->map[REG_RTC_CONTROLM], data, ARRAY_SIZE(data)); if (ret < 0) { @@ -619,13 +613,13 @@ static int max77686_rtc_probe(struct platform_device *pdev) mutex_init(&info->lock); info->dev = &pdev->dev; - info->max77686 = max77686; info->rtc = max77686->rtc; info->drv_data = (const struct max77686_rtc_driver_data *) id->driver_data; - if (!info->drv_data->separate_i2c_addr) - info->max77686->rtc_regmap = info->max77686->regmap; + info->regmap = max77686->regmap; + info->rtc_regmap = (info->drv_data->separate_i2c_addr) ? + max77686->rtc_regmap : info->regmap; platform_set_drvdata(pdev, info); -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Laxman Dewangan <ldewangan@nvidia.com> To: <lee.jones@linaro.org>, <alexandre.belloni@free-electrons.com>, <k.kozlowski@samsung.com>, <javier@osg.samsung.com> Cc: <cw00.choi@samsung.com>, <linux-kernel@vger.kernel.org>, <rtc-linux@googlegroups.com>, Laxman Dewangan <ldewangan@nvidia.com> Subject: [rtc-linux] [PATCH V3 3/5] rtc: max77686: avoid reference of parent device info multiple places Date: Wed, 3 Feb 2016 19:17:11 +0530 [thread overview] Message-ID: <1454507233-9959-4-git-send-email-ldewangan@nvidia.com> (raw) In-Reply-To: <1454507233-9959-1-git-send-email-ldewangan@nvidia.com> Get rid of referring parent device info for register access all the places by making regmap as part of max77686 rtc device info. This will also remove the need of storing parent device info in max77686 rtc device info as this is no more required. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> CC: Krzysztof Kozlowski <k.kozlowski@samsung.com> CC: Javier Martinez Canillas <javier@osg.samsung.com> Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> --- Changes from V1: None, added reviewed/tested by. Changes form V2: - Fix typo in description. drivers/rtc/rtc-max77686.c | 52 ++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c index 11f74ed..ab1f2cd 100644 --- a/drivers/rtc/rtc-max77686.c +++ b/drivers/rtc/rtc-max77686.c @@ -74,12 +74,12 @@ struct max77686_rtc_driver_data { struct max77686_rtc_info { struct device *dev; - struct max77686_dev *max77686; struct i2c_client *rtc; struct rtc_device *rtc_dev; struct mutex lock; struct regmap *regmap; + struct regmap *rtc_regmap; const struct max77686_rtc_driver_data *drv_data; @@ -267,7 +267,7 @@ static int max77686_rtc_update(struct max77686_rtc_info *info, else data = 1 << RTC_RBUDR_SHIFT; - ret = regmap_update_bits(info->max77686->rtc_regmap, + ret = regmap_update_bits(info->rtc_regmap, info->drv_data->map[REG_RTC_UPDATE0], data, data); if (ret < 0) @@ -293,7 +293,7 @@ static int max77686_rtc_read_time(struct device *dev, struct rtc_time *tm) if (ret < 0) goto out; - ret = regmap_bulk_read(info->max77686->rtc_regmap, + ret = regmap_bulk_read(info->rtc_regmap, info->drv_data->map[REG_RTC_SEC], data, ARRAY_SIZE(data)); if (ret < 0) { @@ -322,7 +322,7 @@ static int max77686_rtc_set_time(struct device *dev, struct rtc_time *tm) mutex_lock(&info->lock); - ret = regmap_bulk_write(info->max77686->rtc_regmap, + ret = regmap_bulk_write(info->rtc_regmap, info->drv_data->map[REG_RTC_SEC], data, ARRAY_SIZE(data)); if (ret < 0) { @@ -351,8 +351,8 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) if (ret < 0) goto out; - ret = regmap_bulk_read(info->max77686->rtc_regmap, - map[REG_ALARM1_SEC], data, ARRAY_SIZE(data)); + ret = regmap_bulk_read(info->rtc_regmap, map[REG_ALARM1_SEC], + data, ARRAY_SIZE(data)); if (ret < 0) { dev_err(info->dev, "Fail to read alarm reg(%d)\n", ret); goto out; @@ -370,8 +370,7 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) goto out; } - ret = regmap_read(info->max77686->rtc_regmap, - map[REG_RTC_AE1], &val); + ret = regmap_read(info->rtc_regmap, map[REG_RTC_AE1], &val); if (ret < 0) { dev_err(info->dev, "fail to read alarm enable(%d)\n", ret); @@ -390,7 +389,7 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) } alrm->pending = 0; - ret = regmap_read(info->max77686->regmap, MAX77686_REG_STATUS2, &val); + ret = regmap_read(info->regmap, MAX77686_REG_STATUS2, &val); if (ret < 0) { dev_err(info->dev, "Fail to read status2 reg(%d)\n", ret); goto out; @@ -426,12 +425,10 @@ static int max77686_rtc_stop_alarm(struct max77686_rtc_info *info) goto out; } - ret = regmap_write(info->max77686->rtc_regmap, - map[REG_RTC_AE1], 0); + ret = regmap_write(info->rtc_regmap, map[REG_RTC_AE1], 0); } else { - ret = regmap_bulk_read(info->max77686->rtc_regmap, - map[REG_ALARM1_SEC], data, - ARRAY_SIZE(data)); + ret = regmap_bulk_read(info->rtc_regmap, map[REG_ALARM1_SEC], + data, ARRAY_SIZE(data)); if (ret < 0) { dev_err(info->dev, "Fail to read alarm reg(%d)\n", ret); goto out; @@ -442,9 +439,8 @@ static int max77686_rtc_stop_alarm(struct max77686_rtc_info *info) for (i = 0; i < ARRAY_SIZE(data); i++) data[i] &= ~ALARM_ENABLE_MASK; - ret = regmap_bulk_write(info->max77686->rtc_regmap, - map[REG_ALARM1_SEC], data, - ARRAY_SIZE(data)); + ret = regmap_bulk_write(info->rtc_regmap, map[REG_ALARM1_SEC], + data, ARRAY_SIZE(data)); } if (ret < 0) { @@ -472,12 +468,11 @@ static int max77686_rtc_start_alarm(struct max77686_rtc_info *info) goto out; if (info->drv_data->alarm_enable_reg) { - ret = regmap_write(info->max77686->rtc_regmap, map[REG_RTC_AE1], + ret = regmap_write(info->rtc_regmap, map[REG_RTC_AE1], MAX77802_ALARM_ENABLE_VALUE); } else { - ret = regmap_bulk_read(info->max77686->rtc_regmap, - map[REG_ALARM1_SEC], data, - ARRAY_SIZE(data)); + ret = regmap_bulk_read(info->rtc_regmap, map[REG_ALARM1_SEC], + data, ARRAY_SIZE(data)); if (ret < 0) { dev_err(info->dev, "Fail to read alarm reg(%d)\n", ret); goto out; @@ -496,9 +491,8 @@ static int max77686_rtc_start_alarm(struct max77686_rtc_info *info) if (data[RTC_DATE] & 0x1f) data[RTC_DATE] |= (1 << ALARM_ENABLE_SHIFT); - ret = regmap_bulk_write(info->max77686->rtc_regmap, - map[REG_ALARM1_SEC], data, - ARRAY_SIZE(data)); + ret = regmap_bulk_write(info->rtc_regmap, map[REG_ALARM1_SEC], + data, ARRAY_SIZE(data)); } if (ret < 0) { @@ -527,7 +521,7 @@ static int max77686_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) if (ret < 0) goto out; - ret = regmap_bulk_write(info->max77686->rtc_regmap, + ret = regmap_bulk_write(info->rtc_regmap, info->drv_data->map[REG_ALARM1_SEC], data, ARRAY_SIZE(data)); @@ -593,7 +587,7 @@ static int max77686_rtc_init_reg(struct max77686_rtc_info *info) info->rtc_24hr_mode = 1; - ret = regmap_bulk_write(info->max77686->rtc_regmap, + ret = regmap_bulk_write(info->rtc_regmap, info->drv_data->map[REG_RTC_CONTROLM], data, ARRAY_SIZE(data)); if (ret < 0) { @@ -619,13 +613,13 @@ static int max77686_rtc_probe(struct platform_device *pdev) mutex_init(&info->lock); info->dev = &pdev->dev; - info->max77686 = max77686; info->rtc = max77686->rtc; info->drv_data = (const struct max77686_rtc_driver_data *) id->driver_data; - if (!info->drv_data->separate_i2c_addr) - info->max77686->rtc_regmap = info->max77686->regmap; + info->regmap = max77686->regmap; + info->rtc_regmap = (info->drv_data->separate_i2c_addr) ? + max77686->rtc_regmap : info->regmap; platform_set_drvdata(pdev, info); -- 2.1.4 -- -- You received this message because you are subscribed to "rtc-linux". Membership options at http://groups.google.com/group/rtc-linux . Please read http://groups.google.com/group/rtc-linux/web/checklist before submitting a driver. --- You received this message because you are subscribed to the Google Groups "rtc-linux" group. To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
next prev parent reply other threads:[~2016-02-03 13:58 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-03 13:47 [PATCH V3 0/5] rtc: max77686: make max77686 rtc driver as IP driver Laxman Dewangan 2016-02-03 13:47 ` [rtc-linux] " Laxman Dewangan 2016-02-03 13:47 ` [PATCH V3 1/5] rtc: max77686: fix checkpatch error Laxman Dewangan 2016-02-03 13:47 ` [rtc-linux] " Laxman Dewangan 2016-02-03 13:47 ` [PATCH V3 2/5] rtc: max77686: use rtc regmap to access RTC registers Laxman Dewangan 2016-02-03 13:47 ` [rtc-linux] " Laxman Dewangan 2016-02-03 13:47 ` Laxman Dewangan [this message] 2016-02-03 13:47 ` [rtc-linux] [PATCH V3 3/5] rtc: max77686: avoid reference of parent device info multiple places Laxman Dewangan 2016-02-03 13:47 ` [PATCH V3 4/5] mfd: max77686: do not set i2c client data for rtc i2c client Laxman Dewangan 2016-02-03 13:47 ` [rtc-linux] " Laxman Dewangan 2016-02-03 13:47 ` [PATCH V3 5/5] rtc: max77686: move initialisation of rtc regmap, irq chip locally Laxman Dewangan 2016-02-03 13:47 ` [rtc-linux] " Laxman Dewangan 2016-02-04 0:10 ` Krzysztof Kozlowski 2016-02-04 0:10 ` [rtc-linux] " Krzysztof Kozlowski 2016-02-04 2:03 ` Laxman Dewangan 2016-02-04 2:03 ` [rtc-linux] " Laxman Dewangan 2016-02-04 2:50 ` Laxman Dewangan 2016-02-04 2:50 ` [rtc-linux] " Laxman Dewangan 2016-02-04 3:04 ` Javier Martinez Canillas 2016-02-04 3:04 ` [rtc-linux] " Javier Martinez Canillas 2016-02-04 16:49 ` Javier Martinez Canillas 2016-02-04 16:49 ` [rtc-linux] " Javier Martinez Canillas 2016-02-04 6:58 ` Krzysztof Kozlowski 2016-02-04 6:58 ` [rtc-linux] " Krzysztof Kozlowski 2016-02-04 9:08 ` Krzysztof Kozlowski 2016-02-04 9:08 ` [rtc-linux] " Krzysztof Kozlowski 2016-02-04 10:13 ` Laxman Dewangan 2016-02-04 10:13 ` [rtc-linux] " Laxman Dewangan 2016-02-04 17:35 ` Javier Martinez Canillas 2016-02-04 17:35 ` [rtc-linux] " Javier Martinez Canillas 2016-02-05 14:37 ` Laxman Dewangan 2016-02-05 14:37 ` [rtc-linux] " Laxman Dewangan 2016-02-06 5:30 ` Javier Martinez Canillas 2016-02-06 5:30 ` [rtc-linux] " Javier Martinez Canillas 2016-02-06 6:29 ` Laxman Dewangan 2016-02-06 6:29 ` [rtc-linux] " Laxman Dewangan 2016-02-06 13:01 ` Javier Martinez Canillas 2016-02-06 13:01 ` [rtc-linux] " Javier Martinez Canillas 2016-02-06 13:40 ` Laxman Dewangan 2016-02-06 13:40 ` [rtc-linux] " Laxman Dewangan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1454507233-9959-4-git-send-email-ldewangan@nvidia.com \ --to=ldewangan@nvidia.com \ --cc=alexandre.belloni@free-electrons.com \ --cc=cw00.choi@samsung.com \ --cc=javier@osg.samsung.com \ --cc=k.kozlowski@samsung.com \ --cc=lee.jones@linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=rtc-linux@googlegroups.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.