debugfs: Have debugfs_print_regs32() return void
The seq_printf() will soon just return void, and seq_has_overflowed() should be used instead to see if the seq can no longer accept input. As the return value of debugfs_print_regs32() has no users and the seq_file descriptor should be checked with seq_has_overflowed() instead of return values of functions, it is better to just have debugfs_print_regs32() also return void. Link: http://lkml.kernel.org/p/2634b19eb1c04a9d31148c1fe6f1f3819be95349.1412031505.git.joe@perches.com Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Joe Perches <joe@perches.com> [ original change only updated seq_printf() return, added return of void to debugfs_print_regs32() as well ] Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
parent
a3816ab0e8
commit
9761536e1d
3 changed files with 12 additions and 12 deletions
|
@ -140,7 +140,7 @@ file.
|
||||||
struct dentry *parent,
|
struct dentry *parent,
|
||||||
struct debugfs_regset32 *regset);
|
struct debugfs_regset32 *regset);
|
||||||
|
|
||||||
int debugfs_print_regs32(struct seq_file *s, struct debugfs_reg32 *regs,
|
void debugfs_print_regs32(struct seq_file *s, struct debugfs_reg32 *regs,
|
||||||
int nregs, void __iomem *base, char *prefix);
|
int nregs, void __iomem *base, char *prefix);
|
||||||
|
|
||||||
The "base" argument may be 0, but you may want to build the reg32 array
|
The "base" argument may be 0, but you may want to build the reg32 array
|
||||||
|
|
|
@ -692,18 +692,19 @@ EXPORT_SYMBOL_GPL(debugfs_create_u32_array);
|
||||||
* because some peripherals have several blocks of identical registers,
|
* because some peripherals have several blocks of identical registers,
|
||||||
* for example configuration of dma channels
|
* for example configuration of dma channels
|
||||||
*/
|
*/
|
||||||
int debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
|
void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
|
||||||
int nregs, void __iomem *base, char *prefix)
|
int nregs, void __iomem *base, char *prefix)
|
||||||
{
|
{
|
||||||
int i, ret = 0;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < nregs; i++, regs++) {
|
for (i = 0; i < nregs; i++, regs++) {
|
||||||
if (prefix)
|
if (prefix)
|
||||||
ret += seq_printf(s, "%s", prefix);
|
seq_printf(s, "%s", prefix);
|
||||||
ret += seq_printf(s, "%s = 0x%08x\n", regs->name,
|
seq_printf(s, "%s = 0x%08x\n", regs->name,
|
||||||
readl(base + regs->offset));
|
readl(base + regs->offset));
|
||||||
|
if (seq_has_overflowed(s))
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(debugfs_print_regs32);
|
EXPORT_SYMBOL_GPL(debugfs_print_regs32);
|
||||||
|
|
||||||
|
|
|
@ -92,8 +92,8 @@ struct dentry *debugfs_create_regset32(const char *name, umode_t mode,
|
||||||
struct dentry *parent,
|
struct dentry *parent,
|
||||||
struct debugfs_regset32 *regset);
|
struct debugfs_regset32 *regset);
|
||||||
|
|
||||||
int debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
|
void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
|
||||||
int nregs, void __iomem *base, char *prefix);
|
int nregs, void __iomem *base, char *prefix);
|
||||||
|
|
||||||
struct dentry *debugfs_create_u32_array(const char *name, umode_t mode,
|
struct dentry *debugfs_create_u32_array(const char *name, umode_t mode,
|
||||||
struct dentry *parent,
|
struct dentry *parent,
|
||||||
|
@ -233,10 +233,9 @@ static inline struct dentry *debugfs_create_regset32(const char *name,
|
||||||
return ERR_PTR(-ENODEV);
|
return ERR_PTR(-ENODEV);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
|
static inline void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
|
||||||
int nregs, void __iomem *base, char *prefix)
|
int nregs, void __iomem *base, char *prefix)
|
||||||
{
|
{
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool debugfs_initialized(void)
|
static inline bool debugfs_initialized(void)
|
||||||
|
|
Loading…
Reference in a new issue