On Mon, 2017-10-16 at 23:21 +0200, Hauke Mehrtens wrote:
> On 10/16/2017 02:54 PM, Rafał Miłecki wrote:
> > From: Rafał Miłecki <[email protected]>
> >
> > Using bcma_debug gives a device-specific prefix for messages and pr_cont
> > is a common helper for continuing a line.
> >
> > Signed-off-by: Rafał Miłecki <[email protected]>
>
> Acked-By: Hauke Mehrtens <[email protected]>
>
> > ---
> > drivers/bcma/driver_mips.c | 7 ++++---
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
> > index 89af807cf29c..5904ef1aa624 100644
> > --- a/drivers/bcma/driver_mips.c
> > +++ b/drivers/bcma/driver_mips.c
> > @@ -184,10 +184,11 @@ static void bcma_core_mips_print_irq(struct
> > bcma_device *dev, unsigned int irq)
> > {
> > int i;
> > static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
> > - printk(KERN_DEBUG KBUILD_MODNAME ": core 0x%04x, irq :", dev->id.id);
> > +
> > + bcma_debug(dev->bus, "core 0x%04x, irq :", dev->id.id);
> > for (i = 0; i <= 6; i++)
> > - printk(" %s%s", irq_name[i], i == irq ? "*" : " ");
> > - printk("\n");
> > + pr_cont(" %s%s", irq_name[i], i == irq ? "*" : " ");
> > + pr_cont("\n");
> > }
> >
> > static void bcma_core_mips_dump_irq(struct bcma_bus *bus)
> >
This isn't the same code as it depends on #define DEBUG
and will not output the first line in most cases.
I'd suggest a nack.
Perhaps it'd be better to use a temporary and avoid the
pr_cont uses like:
{
int i;
static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
char interrupts[20];
char *ints = interrupts;
for (i = 0; i < ARRAY_SIZE(irq_name), i++)
ints += sprintf(ints, " %s%c", irq_name[i], i == irq ? '*' : '
');
bcma_debug(dev->bus, "core 0x04x, irq: %s\n", dev->id.id, interrupts);
}