2018-10-02 13:25:20

by Maciej W. Rozycki

Subject: [PATCH] declance: Fix continuation with the adapter identification message

Fix a commit 4bcc595ccd80 ("printk: reinstate KERN_CONT for printing
continuation lines") regression with the `declance' driver, which caused
the adapter identification message to be split between two lines, e.g.:

declance.c: v0.011 by Linux MIPS DECstation task force
tc6: PMAD-AA
, addr = 08:00:2b:1b:2a:6a, irq = 14
tc6: registered as eth0.

Address that properly, by printing identification with a single call,
making the messages now look like:

declance.c: v0.011 by Linux MIPS DECstation task force
tc6: PMAD-AA, addr = 08:00:2b:1b:2a:6a, irq = 14
tc6: registered as eth0.

Signed-off-by: Maciej W. Rozycki <[email protected]>
Fixes: 4bcc595ccd80 ("printk: reinstate KERN_CONT for printing continuation lines")
---
Hi,

Not requesting a backport as the impact of this issue is purely cosmetic.
Deferring driver review to use `netdev_info', etc. in place of `printk' to
another time. Please apply.

Maciej
---
drivers/net/ethernet/amd/declance.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

linux-net-declance-pr-cont.patch
Index: linux-20180930-4maxp64/drivers/net/ethernet/amd/declance.c
===================================================================
--- linux-20180930-4maxp64.orig/drivers/net/ethernet/amd/declance.c
+++ linux-20180930-4maxp64/drivers/net/ethernet/amd/declance.c
@@ -1031,6 +1031,7 @@ static int dec_lance_probe(struct device
int i, ret;
unsigned long esar_base;
unsigned char *esar;
+ const char *desc;

if (dec_lance_debug && version_printed++ == 0)
printk(version);
@@ -1216,19 +1217,20 @@ static int dec_lance_probe(struct device
*/
switch (type) {
case ASIC_LANCE:
- printk("%s: IOASIC onboard LANCE", name);
+ desc = "IOASIC onboard LANCE";
break;
case PMAD_LANCE:
- printk("%s: PMAD-AA", name);
+ desc = "PMAD-AA";
break;
case PMAX_LANCE:
- printk("%s: PMAX onboard LANCE", name);
+ desc = "PMAX onboard LANCE";
break;
}
for (i = 0; i < 6; i++)
dev->dev_addr[i] = esar[i * 4];

- printk(", addr = %pM, irq = %d\n", dev->dev_addr, dev->irq);
+ printk("%s: %s, addr = %pM, irq = %d\n",
+ name, desc, dev->dev_addr, dev->irq);

dev->netdev_ops = &lance_netdev_ops;
dev->watchdog_timeo = 5*HZ;

2018-10-02 18:33:11

by David Miller

Subject: Re: [PATCH] declance: Fix continuation with the adapter identification message

From: "Maciej W. Rozycki" <[email protected]>
Date: Tue, 2 Oct 2018 14:23:45 +0100 (BST)

> Fix a commit 4bcc595ccd80 ("printk: reinstate KERN_CONT for printing
> continuation lines") regression with the `declance' driver, which caused
> the adapter identification message to be split between two lines, e.g.:
>
> declance.c: v0.011 by Linux MIPS DECstation task force
> tc6: PMAD-AA
> , addr = 08:00:2b:1b:2a:6a, irq = 14
> tc6: registered as eth0.
>
> Address that properly, by printing identification with a single call,
> making the messages now look like:
>
> declance.c: v0.011 by Linux MIPS DECstation task force
> tc6: PMAD-AA, addr = 08:00:2b:1b:2a:6a, irq = 14
> tc6: registered as eth0.
>
> Signed-off-by: Maciej W. Rozycki <[email protected]>
> Fixes: 4bcc595ccd80 ("printk: reinstate KERN_CONT for printing continuation lines")

Applied.