Messages in this thread |  | | From | "Winkler, Tomas" <> | Subject | RE: [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry | Date | Sun, 20 Dec 2015 09:44:05 +0000 |
| |
> 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
|  |