Skip to content

Commit

Permalink
ipmi: Remove uses of return value of seq_printf
Browse files Browse the repository at this point in the history
The seq_printf like functions will soon be changed to return void.

Convert these uses to check seq_has_overflowed instead.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
  • Loading branch information
Joe Perches authored and Corey Minyard committed Feb 20, 2015
1 parent 2d06a0c commit d6c5dc1
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 16 deletions.
12 changes: 8 additions & 4 deletions drivers/char/ipmi/ipmi_msghandler.c
Original file line number Diff line number Diff line change
Expand Up @@ -1998,7 +1998,9 @@ static int smi_ipmb_proc_show(struct seq_file *m, void *v)
seq_printf(m, "%x", intf->channels[0].address);
for (i = 1; i < IPMI_MAX_CHANNELS; i++)
seq_printf(m, " %x", intf->channels[i].address);
return seq_putc(m, '\n');
seq_putc(m, '\n');

return seq_has_overflowed(m);
}

static int smi_ipmb_proc_open(struct inode *inode, struct file *file)
Expand All @@ -2017,9 +2019,11 @@ static int smi_version_proc_show(struct seq_file *m, void *v)
{
ipmi_smi_t intf = m->private;

return seq_printf(m, "%u.%u\n",
ipmi_version_major(&intf->bmc->id),
ipmi_version_minor(&intf->bmc->id));
seq_printf(m, "%u.%u\n",
ipmi_version_major(&intf->bmc->id),
ipmi_version_minor(&intf->bmc->id));

return seq_has_overflowed(m);
}

static int smi_version_proc_open(struct inode *inode, struct file *file)
Expand Down
26 changes: 15 additions & 11 deletions drivers/char/ipmi/ipmi_si_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -2979,7 +2979,9 @@ static int smi_type_proc_show(struct seq_file *m, void *v)
{
struct smi_info *smi = m->private;

return seq_printf(m, "%s\n", si_to_str[smi->si_type]);
seq_printf(m, "%s\n", si_to_str[smi->si_type]);

return seq_has_overflowed(m);
}

static int smi_type_proc_open(struct inode *inode, struct file *file)
Expand Down Expand Up @@ -3041,16 +3043,18 @@ static int smi_params_proc_show(struct seq_file *m, void *v)
{
struct smi_info *smi = m->private;

return seq_printf(m,
"%s,%s,0x%lx,rsp=%d,rsi=%d,rsh=%d,irq=%d,ipmb=%d\n",
si_to_str[smi->si_type],
addr_space_to_str[smi->io.addr_type],
smi->io.addr_data,
smi->io.regspacing,
smi->io.regsize,
smi->io.regshift,
smi->irq,
smi->slave_addr);
seq_printf(m,
"%s,%s,0x%lx,rsp=%d,rsi=%d,rsh=%d,irq=%d,ipmb=%d\n",
si_to_str[smi->si_type],
addr_space_to_str[smi->io.addr_type],
smi->io.addr_data,
smi->io.regspacing,
smi->io.regsize,
smi->io.regshift,
smi->irq,
smi->slave_addr);

return seq_has_overflowed(m);
}

static int smi_params_proc_open(struct inode *inode, struct file *file)
Expand Down
4 changes: 3 additions & 1 deletion drivers/char/ipmi/ipmi_ssif.c
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,9 @@ static int ssif_detect(struct i2c_client *client, struct i2c_board_info *info)

static int smi_type_proc_show(struct seq_file *m, void *v)
{
return seq_puts(m, "ssif\n");
seq_puts(m, "ssif\n");

return seq_has_overflowed(m);
}

static int smi_type_proc_open(struct inode *inode, struct file *file)
Expand Down

0 comments on commit d6c5dc1

Please sign in to comment.