From: Guenter Roeck <linux@roeck-us.net> To: Sam Protsenko <semen.protsenko@linaro.org> Cc: Wim Van Sebroeck <wim@linux-watchdog.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: Re: [PATCH v3 06/12] watchdog: s3c2410: Extract disable and mask code into separate functions Date: Wed, 17 Nov 2021 05:35:35 -0800 [thread overview] Message-ID: <20211117133535.GF2435591@roeck-us.net> (raw) In-Reply-To: <20211107202943.8859-7-semen.protsenko@linaro.org> On Sun, Nov 07, 2021 at 10:29:37PM +0200, Sam Protsenko wrote: > The s3c2410wdt_mask_and_disable_reset() function content is bound to be > changed further. Prepare it for upcoming changes by splitting into > separate "mask reset" and "disable reset" functions. But keep > s3c2410wdt_mask_and_disable_reset() function present as a facade. > > This commit doesn't bring any functional change to existing devices, but > merely provides an infrastructure for upcoming chips support. > > Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > Changes in v3: > - Added R-b tag by Krzysztof Kozlowski > > Changes in v2: > - (none): it's a new patch > > drivers/watchdog/s3c2410_wdt.c | 54 ++++++++++++++++++++++------------ > 1 file changed, 35 insertions(+), 19 deletions(-) > > diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c > index 2cc4923a98a5..4ac0a30e835e 100644 > --- a/drivers/watchdog/s3c2410_wdt.c > +++ b/drivers/watchdog/s3c2410_wdt.c > @@ -202,37 +202,53 @@ static inline struct s3c2410_wdt *freq_to_wdt(struct notifier_block *nb) > return container_of(nb, struct s3c2410_wdt, freq_transition); > } > > -static int s3c2410wdt_mask_and_disable_reset(struct s3c2410_wdt *wdt, bool mask) > +static int s3c2410wdt_disable_wdt_reset(struct s3c2410_wdt *wdt, bool mask) > { > + const u32 mask_val = BIT(wdt->drv_data->mask_bit); > + const u32 val = mask ? mask_val : 0; > int ret; > - u32 mask_val = 1 << wdt->drv_data->mask_bit; > - u32 val = 0; > > - /* No need to do anything if no PMU CONFIG needed */ > - if (!(wdt->drv_data->quirks & QUIRK_HAS_PMU_CONFIG)) > - return 0; > + ret = regmap_update_bits(wdt->pmureg, wdt->drv_data->disable_reg, > + mask_val, val); > + if (ret < 0) > + dev_err(wdt->dev, "failed to update reg(%d)\n", ret); > > - if (mask) > - val = mask_val; > + return ret; > +} > > - if (wdt->drv_data->quirks & QUIRK_HAS_PMU_AUTO_DISABLE) { > - ret = regmap_update_bits(wdt->pmureg, > - wdt->drv_data->disable_reg, mask_val, > - val); > - if (ret < 0) > - goto error; > - } > +static int s3c2410wdt_mask_wdt_reset(struct s3c2410_wdt *wdt, bool mask) > +{ > + const u32 mask_val = BIT(wdt->drv_data->mask_bit); > + const u32 val = mask ? mask_val : 0; > + int ret; > > - ret = regmap_update_bits(wdt->pmureg, > - wdt->drv_data->mask_reset_reg, > - mask_val, val); > - error: > + ret = regmap_update_bits(wdt->pmureg, wdt->drv_data->mask_reset_reg, > + mask_val, val); > if (ret < 0) > dev_err(wdt->dev, "failed to update reg(%d)\n", ret); > > return ret; > } > > +static int s3c2410wdt_mask_and_disable_reset(struct s3c2410_wdt *wdt, bool mask) > +{ > + int ret; > + > + if (wdt->drv_data->quirks & QUIRK_HAS_PMU_AUTO_DISABLE) { > + ret = s3c2410wdt_disable_wdt_reset(wdt, mask); > + if (ret < 0) > + return ret; > + } > + > + if (wdt->drv_data->quirks & QUIRK_HAS_PMU_CONFIG) { > + ret = s3c2410wdt_mask_wdt_reset(wdt, mask); > + if (ret < 0) > + return ret; > + } > + > + return 0; > +} > + > static int s3c2410wdt_keepalive(struct watchdog_device *wdd) > { > struct s3c2410_wdt *wdt = watchdog_get_drvdata(wdd); > -- > 2.30.2 >
WARNING: multiple messages have this Message-ID (diff)
From: Guenter Roeck <linux@roeck-us.net> To: Sam Protsenko <semen.protsenko@linaro.org> Cc: Wim Van Sebroeck <wim@linux-watchdog.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: Re: [PATCH v3 06/12] watchdog: s3c2410: Extract disable and mask code into separate functions Date: Wed, 17 Nov 2021 05:35:35 -0800 [thread overview] Message-ID: <20211117133535.GF2435591@roeck-us.net> (raw) In-Reply-To: <20211107202943.8859-7-semen.protsenko@linaro.org> On Sun, Nov 07, 2021 at 10:29:37PM +0200, Sam Protsenko wrote: > The s3c2410wdt_mask_and_disable_reset() function content is bound to be > changed further. Prepare it for upcoming changes by splitting into > separate "mask reset" and "disable reset" functions. But keep > s3c2410wdt_mask_and_disable_reset() function present as a facade. > > This commit doesn't bring any functional change to existing devices, but > merely provides an infrastructure for upcoming chips support. > > Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > Changes in v3: > - Added R-b tag by Krzysztof Kozlowski > > Changes in v2: > - (none): it's a new patch > > drivers/watchdog/s3c2410_wdt.c | 54 ++++++++++++++++++++++------------ > 1 file changed, 35 insertions(+), 19 deletions(-) > > diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c > index 2cc4923a98a5..4ac0a30e835e 100644 > --- a/drivers/watchdog/s3c2410_wdt.c > +++ b/drivers/watchdog/s3c2410_wdt.c > @@ -202,37 +202,53 @@ static inline struct s3c2410_wdt *freq_to_wdt(struct notifier_block *nb) > return container_of(nb, struct s3c2410_wdt, freq_transition); > } > > -static int s3c2410wdt_mask_and_disable_reset(struct s3c2410_wdt *wdt, bool mask) > +static int s3c2410wdt_disable_wdt_reset(struct s3c2410_wdt *wdt, bool mask) > { > + const u32 mask_val = BIT(wdt->drv_data->mask_bit); > + const u32 val = mask ? mask_val : 0; > int ret; > - u32 mask_val = 1 << wdt->drv_data->mask_bit; > - u32 val = 0; > > - /* No need to do anything if no PMU CONFIG needed */ > - if (!(wdt->drv_data->quirks & QUIRK_HAS_PMU_CONFIG)) > - return 0; > + ret = regmap_update_bits(wdt->pmureg, wdt->drv_data->disable_reg, > + mask_val, val); > + if (ret < 0) > + dev_err(wdt->dev, "failed to update reg(%d)\n", ret); > > - if (mask) > - val = mask_val; > + return ret; > +} > > - if (wdt->drv_data->quirks & QUIRK_HAS_PMU_AUTO_DISABLE) { > - ret = regmap_update_bits(wdt->pmureg, > - wdt->drv_data->disable_reg, mask_val, > - val); > - if (ret < 0) > - goto error; > - } > +static int s3c2410wdt_mask_wdt_reset(struct s3c2410_wdt *wdt, bool mask) > +{ > + const u32 mask_val = BIT(wdt->drv_data->mask_bit); > + const u32 val = mask ? mask_val : 0; > + int ret; > > - ret = regmap_update_bits(wdt->pmureg, > - wdt->drv_data->mask_reset_reg, > - mask_val, val); > - error: > + ret = regmap_update_bits(wdt->pmureg, wdt->drv_data->mask_reset_reg, > + mask_val, val); > if (ret < 0) > dev_err(wdt->dev, "failed to update reg(%d)\n", ret); > > return ret; > } > > +static int s3c2410wdt_mask_and_disable_reset(struct s3c2410_wdt *wdt, bool mask) > +{ > + int ret; > + > + if (wdt->drv_data->quirks & QUIRK_HAS_PMU_AUTO_DISABLE) { > + ret = s3c2410wdt_disable_wdt_reset(wdt, mask); > + if (ret < 0) > + return ret; > + } > + > + if (wdt->drv_data->quirks & QUIRK_HAS_PMU_CONFIG) { > + ret = s3c2410wdt_mask_wdt_reset(wdt, mask); > + if (ret < 0) > + return ret; > + } > + > + return 0; > +} > + > static int s3c2410wdt_keepalive(struct watchdog_device *wdd) > { > struct s3c2410_wdt *wdt = watchdog_get_drvdata(wdd); > -- > 2.30.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-11-17 13:35 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-07 20:29 [PATCH v3 00/12] watchdog: s3c2410: Add Exynos850 support Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-07 20:29 ` [PATCH v3 01/12] dt-bindings: watchdog: Require samsung,syscon-phandle for Exynos7 Sam Protsenko 2021-11-07 20:29 ` [PATCH v3 01/12] dt-bindings: watchdog: Require samsung, syscon-phandle " Sam Protsenko 2021-11-17 13:33 ` [PATCH v3 01/12] dt-bindings: watchdog: Require samsung,syscon-phandle " Guenter Roeck 2021-11-17 13:33 ` Guenter Roeck 2021-11-07 20:29 ` [PATCH v3 02/12] dt-bindings: watchdog: Document Exynos850 watchdog bindings Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-08 13:08 ` Krzysztof Kozlowski 2021-11-08 13:08 ` Krzysztof Kozlowski 2021-11-12 22:43 ` Rob Herring 2021-11-12 22:43 ` Rob Herring 2021-11-17 13:34 ` Guenter Roeck 2021-11-17 13:34 ` Guenter Roeck 2021-11-07 20:29 ` [PATCH v3 03/12] watchdog: s3c2410: Fail probe if can't find valid timeout Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-17 13:34 ` Guenter Roeck 2021-11-17 13:34 ` Guenter Roeck 2021-11-07 20:29 ` [PATCH v3 04/12] watchdog: s3c2410: Let kernel kick watchdog Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-17 13:34 ` Guenter Roeck 2021-11-17 13:34 ` Guenter Roeck 2021-11-07 20:29 ` [PATCH v3 05/12] watchdog: s3c2410: Make reset disable register optional Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-17 13:35 ` Guenter Roeck 2021-11-17 13:35 ` Guenter Roeck 2021-11-07 20:29 ` [PATCH v3 06/12] watchdog: s3c2410: Extract disable and mask code into separate functions Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-17 13:35 ` Guenter Roeck [this message] 2021-11-17 13:35 ` Guenter Roeck 2021-11-07 20:29 ` [PATCH v3 07/12] watchdog: s3c2410: Implement a way to invert mask reg value Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-17 13:35 ` Guenter Roeck 2021-11-17 13:35 ` Guenter Roeck 2021-11-07 20:29 ` [PATCH v3 08/12] watchdog: s3c2410: Add support for WDT counter enable register Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-17 13:36 ` Guenter Roeck 2021-11-17 13:36 ` Guenter Roeck 2021-11-07 20:29 ` [PATCH v3 09/12] watchdog: s3c2410: Cleanup PMU related code Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-17 13:36 ` Guenter Roeck 2021-11-17 13:36 ` Guenter Roeck 2021-11-07 20:29 ` [PATCH v3 10/12] watchdog: s3c2410: Support separate source clock Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-08 13:24 ` Krzysztof Kozlowski 2021-11-08 13:24 ` Krzysztof Kozlowski 2021-11-17 13:37 ` Guenter Roeck 2021-11-17 13:37 ` Guenter Roeck 2021-11-07 20:29 ` [PATCH v3 11/12] watchdog: s3c2410: Remove superfluous err label Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-17 13:37 ` Guenter Roeck 2021-11-17 13:37 ` Guenter Roeck 2021-11-07 20:29 ` [PATCH v3 12/12] watchdog: s3c2410: Add Exynos850 support Sam Protsenko 2021-11-07 20:29 ` Sam Protsenko 2021-11-08 13:25 ` Krzysztof Kozlowski 2021-11-08 13:25 ` Krzysztof Kozlowski 2021-11-17 13:37 ` Guenter Roeck 2021-11-17 13:37 ` Guenter Roeck 2021-11-20 20:29 ` Guenter Roeck 2021-11-20 20:29 ` Guenter Roeck 2021-11-21 16:25 ` Sam Protsenko 2021-11-21 16:25 ` Sam Protsenko
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=20211117133535.GF2435591@roeck-us.net \ --to=linux@roeck-us.net \ --cc=devicetree@vger.kernel.org \ --cc=krzysztof.kozlowski@canonical.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=robh+dt@kernel.org \ --cc=semen.protsenko@linaro.org \ --cc=wim@linux-watchdog.org \ /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.