Thanks, queued for 3.20. -corey
On 02/17/2015 01:10 PM, Joe Perches wrote: > 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 <[email protected]> > --- > drivers/char/ipmi/ipmi_msghandler.c | 12 ++++++++---- > drivers/char/ipmi/ipmi_si_intf.c | 26 +++++++++++++++----------- > drivers/char/ipmi/ipmi_ssif.c | 4 +++- > 3 files changed, 26 insertions(+), 16 deletions(-) > > diff --git a/drivers/char/ipmi/ipmi_msghandler.c > b/drivers/char/ipmi/ipmi_msghandler.c > index bf95efc..fa0b941 100644 > --- a/drivers/char/ipmi/ipmi_msghandler.c > +++ b/drivers/char/ipmi/ipmi_msghandler.c > @@ -1997,7 +1997,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) > @@ -2016,9 +2018,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) > diff --git a/drivers/char/ipmi/ipmi_si_intf.c > b/drivers/char/ipmi/ipmi_si_intf.c > index fd6110f..321ecb2 100644 > --- a/drivers/char/ipmi/ipmi_si_intf.c > +++ b/drivers/char/ipmi/ipmi_si_intf.c > @@ -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) > @@ -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) > diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c > index 74128e6..f6e378d 100644 > --- a/drivers/char/ipmi/ipmi_ssif.c > +++ b/drivers/char/ipmi/ipmi_ssif.c > @@ -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) > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
