Hi Steve,
On 18-06-04 12:27, Steve Twiss wrote:
> Hi Marco,
>
> On 04 June 2018 10:43, Marco Felsch wrote:
> > Subject: [PATCH 1/2] watchdog: da9063: rename helper function to avoid misunderstandings
> >
> > _da9063_wdt_set_timeout() is called by da9063_wdt_set_timeout(),
> > da9063_wdt_start() and da9063_wdt_probe() but the name expect only to be
> > called by da9063_wdg_set_timeout(). Rename the function to avoid
> > misunderstandings.
> >
> > Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx>
> > ---
> > drivers/watchdog/da9063_wdt.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/watchdog/da9063_wdt.c b/drivers/watchdog/da9063_wdt.c
> > index a4380a887e85..760aa9bca81b 100644
> > --- a/drivers/watchdog/da9063_wdt.c
> > +++ b/drivers/watchdog/da9063_wdt.c
> > @@ -64,7 +64,7 @@ static int da9063_wdt_disable_timer(struct da9063 *da9063)
> > DA9063_TWDSCALE_DISABLE);
> > }
> >
> > -static int _da9063_wdt_set_timeout(struct da9063 *da9063, unsigned int regval)
> > +static int da9063_wdt_update_timeout(struct da9063 *da9063, unsigned int
> > regval)
> > {
> > int ret;
> >
> > @@ -93,7 +93,7 @@ static int da9063_wdt_start(struct watchdog_device *wdd)
> > int ret;
> >
> > selector = da9063_wdt_timeout_to_sel(wdd->timeout);
> > - ret = _da9063_wdt_set_timeout(da9063, selector);
> > + ret = da9063_wdt_update_timeout(da9063, selector);
> > if (ret)
> > dev_err(da9063->dev, "Watchdog failed to start (err = %d)\n",
> > ret);
> > @@ -148,7 +148,7 @@ static int da9063_wdt_set_timeout(struct
> > watchdog_device *wdd,
> > * enabling the watchdog, so the timeout must be buffered by the driver.
> > */
> > if (watchdog_active(wdd))
> > - ret = _da9063_wdt_set_timeout(da9063, selector);
> > + ret = da9063_wdt_update_timeout(da9063, selector);
> >
> > if (ret)
> > dev_err(da9063->dev, "Failed to set watchdog timeout (err =
> > %d)\n",
> > @@ -223,7 +223,7 @@ static int da9063_wdt_probe(struct platform_device
> > *pdev)
> > unsigned int timeout;
> >
> > timeout =
> > da9063_wdt_timeout_to_sel(DA9063_WDG_TIMEOUT);
> > - _da9063_wdt_set_timeout(da9063, timeout);
> > + da9063_wdt_update_timeout(da9063, timeout);
> > set_bit(WDOG_HW_RUNNING, &wdd->status);
> > }
> >
> > --
> > 2.17.1
>
> What kernel did you use for this please?
It is based on the watchdog-next branch
(git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git).
Sorry for the confusion I should have add a cover-letter comment.
Regards,
Marco
> I get the following patch warnings when applying to v4.17:
>
> patching file drivers/watchdog/da9063_wdt.c
> Hunk #1 succeeded at 45 with fuzz 2 (offset -19 lines).
> Hunk #2 succeeded at 58 (offset -35 lines).
> Hunk #3 FAILED at 148.
> Hunk #4 FAILED at 223.
> 2 out of 4 hunks FAILED -- saving rejects to file drivers/watchdog/da9063_wdt.c.rej
>
> Regards,
> Steve
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
