Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1295547

RE: [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry

Show all headers | View raw

> On 12/17/2015 06:49 AM, Tomas Winkler wrote:
> > Add entry for dumping current watchdog internal state
> >
> > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > ---
> >   drivers/watchdog/mei_wdt.c | 84
> ++++++++++++++++++++++++++++++++++++++++++++++
> >   1 file changed, 84 insertions(+)
> >
> > diff --git a/drivers/watchdog/mei_wdt.c b/drivers/watchdog/mei_wdt.c
> > index 3c97deb70d90..a3f1c1613c32 100644
> > --- a/drivers/watchdog/mei_wdt.c
> > +++ b/drivers/watchdog/mei_wdt.c
> > @@ -16,6 +16,7 @@
> >   #include <linux/slab.h>
> >   #include <linux/interrupt.h>
> >   #include <linux/watchdog.h>
> > +#include <linux/debugfs.h>
> >
> >   #include <linux/uuid.h>
> >   #include <linux/mei_cl_bus.h>
> > @@ -54,6 +55,19 @@ enum mei_wdt_state {
> >   	MEI_WDT_STOPPING,
> >   };
> >
> > +#if IS_ENABLED(CONFIG_DEBUG_FS)
> > +static const char *mei_wdt_state_str(enum mei_wdt_state state)
> > +{
> > +	switch (state) {
> > +	case MEI_WDT_IDLE: return "IDLE";
> > +	case MEI_WDT_START: return "START";
> > +	case MEI_WDT_RUNNING: return "RUNNING";
> > +	case MEI_WDT_STOPPING: return "STOPPING";
> > +	default: return "unknown";
> 
> Doesn't this cause checkpatch warnings ?
It doesn't and also checkpatch.pl  is just a help tool. 
> 
> > +	}
> > +}
> > +#endif /* CONFIG_DEBUG_FS */
> > +
> 
> Can you move this conditional code into the other #ifdef block below ?

I'm removing the ifdef in the following patch so this is just for this path to not to spill warning the compilation w/o CONFIG_DEBUG_FS set.

	.start       = mei_wdt_ops_start,
> > @@ -348,6 +428,8 @@ static int mei_wdt_probe(struct mei_cl_device *cldev,
> >   	if (ret)
> >   		goto err_disable;
> >
> > +	dbgfs_register(wdt);
> > +
> >   	return 0;
> >
> >   err_disable:
> > @@ -367,6 +449,8 @@ static int mei_wdt_remove(struct mei_cl_device *cldev)
> >
> >   	kref_put(&wdt->refcnt, mei_wdt_release);
> >
> > +	dbgfs_deregister(wdt);
> > +
> 
> This should probably come before the call to kref_put() since it uses wdt.

Good catch, will resend.
Tomas

 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[char-misc-next v2 0/7] mei: create proper iAMT watchdog driver Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
  [char-misc-next v2 2/7] mei: wd: drop the watchdog code from the core mei driver Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
  [char-misc-next v2 1/7] mei: drop nfc leftovers from the mei driver Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
  [char-misc-next v2 6/7] watchdog: mei_wdt: register wd device only if required Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
    Re: [char-misc-next v2 6/7] watchdog: mei_wdt: register wd device  only if required Guenter Roeck <linux@roeck-us.net> - 2015-12-18 18:00 +0100
      RE: [char-misc-next v2 6/7] watchdog: mei_wdt: register wd device  only if required "Winkler, Tomas" <tomas.winkler@intel.com> - 2015-12-20 13:30 +0100
        Re: [char-misc-next v2 6/7] watchdog: mei_wdt: register wd device  only if required Guenter Roeck <linux@roeck-us.net> - 2015-12-20 19:20 +0100
  [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device on event Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
    Re: [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device on  event Guenter Roeck <linux@roeck-us.net> - 2015-12-18 18:10 +0100
      Re: [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device  on event One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk> - 2015-12-18 18:30 +0100
        Re: [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device on  event Guenter Roeck <linux@roeck-us.net> - 2015-12-18 19:00 +0100
          Re: [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device  on event One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk> - 2015-12-18 19:20 +0100
            RE: [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device  on event "Winkler, Tomas" <tomas.winkler@intel.com> - 2015-12-20 14:00 +0100
  [char-misc-next v2 5/7] mei: bus: whitelist the watchdog client Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
  [char-misc-next v2 3/7] watchdog: mei_wdt: implement MEI iAMT watchdog driver Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
    Re: [char-misc-next v2 3/7] watchdog: mei_wdt: implement MEI iAMT  watchdog driver Guenter Roeck <linux@roeck-us.net> - 2015-12-18 17:40 +0100
  [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
    Re: [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry Guenter Roeck <linux@roeck-us.net> - 2015-12-18 17:50 +0100
      RE: [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry "Winkler, Tomas" <tomas.winkler@intel.com> - 2015-12-20 10:50 +0100
        Re: [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry Guenter Roeck <linux@roeck-us.net> - 2015-12-20 11:50 +0100
          RE: [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry "Winkler, Tomas" <tomas.winkler@intel.com> - 2015-12-20 13:00 +0100

csiph-web