* [BUG 2.6.34-rc1] bogus "(null)" in tulip init messages
@ 2010-03-10 15:33 Mikael Pettersson
2010-03-10 16:41 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Mikael Pettersson @ 2010-03-10 15:33 UTC (permalink / raw)
To: netdev; +Cc: Grant Grundler, Kyle McMartin, linux-kernel
Booting 2.6.34-rc1 on a machine with a tulip nic I see
a number of kernel messages that include "(null)" where
previous kernels included the string "tulip0":
--- dmesg-2.6.33 2010-02-26 12:58:32.000000000 +0100
+++ dmesg-2.6.34-rc1 2010-03-10 16:17:06.000000000 +0100
...
Linux Tulip driver version 1.1.15 (Feb 27, 2007)
tulip 0000:00:0f.0: enabling device (0014 -> 0017)
-tulip0: EEPROM default media type Autosense.
-tulip0: Index #0 - Media 10baseT (#0) described by a 21142 Serial PHY (2) block.
-tulip0: Index #1 - Media 10baseT-FDX (#4) described by a 21142 Serial PHY (2) block.
-tulip0: Index #2 - Media 100baseTx (#3) described by a 21143 SYM PHY (4) block.
-tulip0: Index #3 - Media 100baseTx-FDX (#5) described by a 21143 SYM PHY (4) block.
-tulip0: Index #4 - Media 100baseTx (#3) described by a 21143 reset method (5) block.
-eth0: Digital DS21142/43 Tulip rev 48 at Port 0x800, 00:00:c5:50:f9:51, IRQ 25.
+ (null): EEPROM default media type Autosense
+ (null): Index #0 - Media 10baseT (#0) described by a 21142 Serial PHY (2) block
+ (null): Index #1 - Media 10baseT-FDX (#4) described by a 21142 Serial PHY (2) block
+ (null): Index #2 - Media 100baseTx (#3) described by a 21143 SYM PHY (4) block
+ (null): Index #3 - Media 100baseTx-FDX (#5) described by a 21143 SYM PHY (4) block
+ (null): Index #4 - Media 100baseTx (#3) described by a 21143 reset method (5) block
+net eth0: Digital DS21142/43 Tulip rev 48 at Port 0x800, 00:00:c5:50:f9:51, IRQ 25
Apart from this the tulip driver seems to work in 2.6.34-rc1.
/Mikael
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [BUG 2.6.34-rc1] bogus "(null)" in tulip init messages
2010-03-10 15:33 [BUG 2.6.34-rc1] bogus "(null)" in tulip init messages Mikael Pettersson
@ 2010-03-10 16:41 ` David Miller
2010-03-10 17:34 ` [PATCH] drivers/net/tulip/eeprom.c: fix " Joe Perches
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2010-03-10 16:41 UTC (permalink / raw)
To: mikpe; +Cc: netdev, grundler, kyle, linux-kernel, joe
From: Mikael Pettersson <mikpe@it.uu.se>
Date: Wed, 10 Mar 2010 16:33:28 +0100
> Booting 2.6.34-rc1 on a machine with a tulip nic I see
> a number of kernel messages that include "(null)" where
> previous kernels included the string "tulip0":
CC:'ing the guilty party :-) It's one of the following
commits:
commit 44298ec0f20c45b9be96e181976aef1152d373b2
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:29 2010 +0000
tulip/xircom_cb.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Remove DRV_NAME and xircom_cb from pr_<level>
Convert embedded function names in logging messages to %s, __func__
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a1e37bc5e2d0ff8d025221e27c2bfff762072311
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:28 2010 +0000
tulip/winbond-840.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Convert %d.%d.%d.%d to %pI4
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e02fb7aa0714ca9357571bb15ef0fe278a150cc7
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:27 2010 +0000
tulip/uli526x.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Remove DRV_NAME from logging messages
Add do {} while(0) to ULI526X_DBUG macro
Make SHOW_MEDIA_TYPE macro more readable
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 27146c43c4dbb727c4a211541af46577de2984af
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:26 2010 +0000
tulip/timer.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 22086a1172b69b9f6200e169dc99a252a204affb
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:25 2010 +0000
tulip/pnic2.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1df8bbd1420705277cd382b1386cda724d61a678
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:24 2010 +0000
tulip/pnic.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit fa0b9a4c41490d550ebd3bd418f4551c989fec5d
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:23 2010 +0000
tulip/media.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit abe02af8263ae17e201994a1be7fc5eac6642acf
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:22 2010 +0000
tulip/interrupt.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e9cd1cbcda5e21706b03b543b1b73600b07f323f
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:21 2010 +0000
tulip/eeprom.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit dde7c8ef167996689bc464eb65d2b09ef05263c2
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:20 2010 +0000
tulip/dmfe.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Remove 'DRV_NAME ": ' from logging messages
Convert commented out printks to pr_debug
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f639dc7dadcbd97f1d666d5ffe00eab1ea3c0f6d
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:19 2010 +0000
tulip/de2104x.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 985a63ed3faf0faaba840d806f5ca4d360d13ad3
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:18 2010 +0000
tulip/21142.c: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where a dev is available
Convert printks to pr_<level> where not
Coalesce format strings
Change print formats with %d.dx to %0dx
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d60bec4eb7076acfc940cca3f9f219e7653a1466
Author: Joe Perches <joe@perches.com>
Date: Thu Jan 28 20:59:17 2010 +0000
tulip_core: Use dev_<level> and pr_<level>
Convert printks to dev_<level> where appropriate
Convert printks to pr_<level>
Change print formats with %d.dx to %0dx
Coalesce long formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
> --- dmesg-2.6.33 2010-02-26 12:58:32.000000000 +0100
> +++ dmesg-2.6.34-rc1 2010-03-10 16:17:06.000000000 +0100
> ...
> Linux Tulip driver version 1.1.15 (Feb 27, 2007)
> tulip 0000:00:0f.0: enabling device (0014 -> 0017)
> -tulip0: EEPROM default media type Autosense.
> -tulip0: Index #0 - Media 10baseT (#0) described by a 21142 Serial PHY (2) block.
> -tulip0: Index #1 - Media 10baseT-FDX (#4) described by a 21142 Serial PHY (2) block.
> -tulip0: Index #2 - Media 100baseTx (#3) described by a 21143 SYM PHY (4) block.
> -tulip0: Index #3 - Media 100baseTx-FDX (#5) described by a 21143 SYM PHY (4) block.
> -tulip0: Index #4 - Media 100baseTx (#3) described by a 21143 reset method (5) block.
> -eth0: Digital DS21142/43 Tulip rev 48 at Port 0x800, 00:00:c5:50:f9:51, IRQ 25.
> + (null): EEPROM default media type Autosense
> + (null): Index #0 - Media 10baseT (#0) described by a 21142 Serial PHY (2) block
> + (null): Index #1 - Media 10baseT-FDX (#4) described by a 21142 Serial PHY (2) block
> + (null): Index #2 - Media 100baseTx (#3) described by a 21143 SYM PHY (4) block
> + (null): Index #3 - Media 100baseTx-FDX (#5) described by a 21143 SYM PHY (4) block
> + (null): Index #4 - Media 100baseTx (#3) described by a 21143 reset method (5) block
> +net eth0: Digital DS21142/43 Tulip rev 48 at Port 0x800, 00:00:c5:50:f9:51, IRQ 25
>
> Apart from this the tulip driver seems to work in 2.6.34-rc1.
>
> /Mikael
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages
2010-03-10 16:41 ` David Miller
@ 2010-03-10 17:34 ` Joe Perches
2010-03-10 19:16 ` Mikael Pettersson
0 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2010-03-10 17:34 UTC (permalink / raw)
To: David Miller; +Cc: mikpe, netdev, grundler, kyle, linux-kernel
On Wed, 2010-03-10 at 08:41 -0800, David Miller wrote:
> From: Mikael Pettersson <mikpe@it.uu.se>
> Date: Wed, 10 Mar 2010 16:33:28 +0100
> > Booting 2.6.34-rc1 on a machine with a tulip nic I see
> > a number of kernel messages that include "(null)" where
> > previous kernels included the string "tulip0":
> CC:'ing the guilty party :-) It's one of the following
> commits:
Thanks Mikael.
Anonymity has some good attributes.
Blame avoidance is one of them.
I've broad shoulders. It's me, then Dwight Howard...
There might be another few of these where ->name or ->dev
was used before struct device or net_device was registered.
I'll go back and check.
tulip_core has:
if (tp->flags & HAS_MEDIA_TABLE) {
sprintf(dev->name, DRV_NAME "%d", board_idx); /* hack */
tulip_parse_eeprom(dev);
strcpy(dev->name, "eth%d"); /* un-hack */
}
So I don't feel _too_ bad.
tulip_parse_eeprom is done before register_netdev so the logging
there can not use netdev_<level> or dev_<level>(&dev->dev
Signed-off-by: Joe Perches <joe@perches.com>
drivers/net/tulip/eeprom.c | 54 ++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 24 deletions(-)
---
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 93f4e83..49f05d1 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -143,6 +143,12 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
void __devinit tulip_parse_eeprom(struct net_device *dev)
{
+ /*
+ dev is not registered at this point, so logging messages can't
+ use dev_<level> or netdev_<level> but dev->name is good via a
+ hack in the caller
+ */
+
/* The last media info list parsed, for multiport boards. */
static struct mediatable *last_mediatable;
static unsigned char *last_ee_data;
@@ -161,15 +167,14 @@ void __devinit tulip_parse_eeprom(struct net_device *dev)
if (ee_data[0] == 0xff) {
if (last_mediatable) {
controller_index++;
- dev_info(&dev->dev,
- "Controller %d of multiport board\n",
- controller_index);
+ pr_info("%s: Controller %d of multiport board\n",
+ dev->name, controller_index);
tp->mtable = last_mediatable;
ee_data = last_ee_data;
goto subsequent_board;
} else
- dev_info(&dev->dev,
- "Missing EEPROM, this interface may not work correctly!\n");
+ pr_info("%s: Missing EEPROM, this interface may not work correctly!\n",
+ dev->name);
return;
}
/* Do a fix-up based on the vendor half of the station address prefix. */
@@ -181,15 +186,14 @@ void __devinit tulip_parse_eeprom(struct net_device *dev)
i++; /* An Accton EN1207, not an outlaw Maxtech. */
memcpy(ee_data + 26, eeprom_fixups[i].newtable,
sizeof(eeprom_fixups[i].newtable));
- dev_info(&dev->dev,
- "Old format EEPROM on '%s' board. Using substitute media control info\n",
- eeprom_fixups[i].name);
+ pr_info("%s: Old format EEPROM on '%s' board. Using substitute media control info\n",
+ dev->name, eeprom_fixups[i].name);
break;
}
}
if (eeprom_fixups[i].name == NULL) { /* No fixup found. */
- dev_info(&dev->dev,
- "Old style EEPROM with no media selection information\n");
+ pr_info("%s: Old style EEPROM with no media selection information\n",
+ dev->name);
return;
}
}
@@ -217,8 +221,8 @@ subsequent_board:
/* there is no phy information, don't even try to build mtable */
if (count == 0) {
if (tulip_debug > 0)
- dev_warn(&dev->dev,
- "no phy info, aborting mtable build\n");
+ pr_warning("%s: no phy info, aborting mtable build\n",
+ dev->name);
return;
}
@@ -234,8 +238,10 @@ subsequent_board:
mtable->has_nonmii = mtable->has_mii = mtable->has_reset = 0;
mtable->csr15dir = mtable->csr15val = 0;
- dev_info(&dev->dev, "EEPROM default media type %s\n",
- media & 0x0800 ? "Autosense" : medianame[media & MEDIA_MASK]);
+ pr_info("%s: EEPROM default media type %s\n",
+ dev->name,
+ media & 0x0800 ? "Autosense"
+ : medianame[media & MEDIA_MASK]);
for (i = 0; i < count; i++) {
struct medialeaf *leaf = &mtable->mleaf[i];
@@ -298,17 +304,17 @@ subsequent_board:
}
if (tulip_debug > 1 && leaf->media == 11) {
unsigned char *bp = leaf->leafdata;
- dev_info(&dev->dev,
- "MII interface PHY %d, setup/reset sequences %d/%d long, capabilities %02x %02x\n",
- bp[0], bp[1], bp[2 + bp[1]*2],
- bp[5 + bp[2 + bp[1]*2]*2],
- bp[4 + bp[2 + bp[1]*2]*2]);
+ pr_info("%s: MII interface PHY %d, setup/reset sequences %d/%d long, capabilities %02x %02x\n",
+ dev->name,
+ bp[0], bp[1], bp[2 + bp[1]*2],
+ bp[5 + bp[2 + bp[1]*2]*2],
+ bp[4 + bp[2 + bp[1]*2]*2]);
}
- dev_info(&dev->dev,
- "Index #%d - Media %s (#%d) described by a %s (%d) block\n",
- i, medianame[leaf->media & 15], leaf->media,
- leaf->type < ARRAY_SIZE(block_name) ? block_name[leaf->type] : "<unknown>",
- leaf->type);
+ pr_info("%s: Index #%d - Media %s (#%d) described by a %s (%d) block\n",
+ dev->name,
+ i, medianame[leaf->media & 15], leaf->media,
+ leaf->type < ARRAY_SIZE(block_name) ? block_name[leaf->type] : "<unknown>",
+ leaf->type);
}
if (new_advertise)
tp->sym_advertise = new_advertise;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages
2010-03-10 17:34 ` [PATCH] drivers/net/tulip/eeprom.c: fix " Joe Perches
@ 2010-03-10 19:16 ` Mikael Pettersson
2010-03-13 20:26 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Mikael Pettersson @ 2010-03-10 19:16 UTC (permalink / raw)
To: Joe Perches; +Cc: David Miller, mikpe, netdev, grundler, kyle, linux-kernel
Joe Perches writes:
> On Wed, 2010-03-10 at 08:41 -0800, David Miller wrote:
> > From: Mikael Pettersson <mikpe@it.uu.se>
> > Date: Wed, 10 Mar 2010 16:33:28 +0100
> > > Booting 2.6.34-rc1 on a machine with a tulip nic I see
> > > a number of kernel messages that include "(null)" where
> > > previous kernels included the string "tulip0":
> > CC:'ing the guilty party :-) It's one of the following
> > commits:
>
> Thanks Mikael.
>
> Anonymity has some good attributes.
> Blame avoidance is one of them.
>
> I've broad shoulders. It's me, then Dwight Howard...
>
> There might be another few of these where ->name or ->dev
> was used before struct device or net_device was registered.
> I'll go back and check.
>
> tulip_core has:
>
> if (tp->flags & HAS_MEDIA_TABLE) {
> sprintf(dev->name, DRV_NAME "%d", board_idx); /* hack */
> tulip_parse_eeprom(dev);
> strcpy(dev->name, "eth%d"); /* un-hack */
> }
>
> So I don't feel _too_ bad.
>
> tulip_parse_eeprom is done before register_netdev so the logging
> there can not use netdev_<level> or dev_<level>(&dev->dev
>
> Signed-off-by: Joe Perches <joe@perches.com>
> drivers/net/tulip/eeprom.c | 54 ++++++++++++++++++++++++-------------------
> 1 files changed, 30 insertions(+), 24 deletions(-)
Thanks, that fixed it:
tulip 0000:00:0f.0: enabling device (0014 -> 0017)
tulip0: EEPROM default media type Autosense
tulip0: Index #0 - Media 10baseT (#0) described by a 21142 Serial PHY (2) block
tulip0: Index #1 - Media 10baseT-FDX (#4) described by a 21142 Serial PHY (2) block
tulip0: Index #2 - Media 100baseTx (#3) described by a 21143 SYM PHY (4) block
tulip0: Index #3 - Media 100baseTx-FDX (#5) described by a 21143 SYM PHY (4) block
tulip0: Index #4 - Media 100baseTx (#3) described by a 21143 reset method (5) block
net eth0: Digital DS21142/43 Tulip rev 48 at Port 0x800, 00:00:c5:50:f9:51, IRQ 25
Tested-by: Mikael Pettersson <mikpe@it.uu.se>
> ---
> diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
> index 93f4e83..49f05d1 100644
> --- a/drivers/net/tulip/eeprom.c
> +++ b/drivers/net/tulip/eeprom.c
> @@ -143,6 +143,12 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
>
> void __devinit tulip_parse_eeprom(struct net_device *dev)
> {
> + /*
> + dev is not registered at this point, so logging messages can't
> + use dev_<level> or netdev_<level> but dev->name is good via a
> + hack in the caller
> + */
> +
> /* The last media info list parsed, for multiport boards. */
> static struct mediatable *last_mediatable;
> static unsigned char *last_ee_data;
> @@ -161,15 +167,14 @@ void __devinit tulip_parse_eeprom(struct net_device *dev)
> if (ee_data[0] == 0xff) {
> if (last_mediatable) {
> controller_index++;
> - dev_info(&dev->dev,
> - "Controller %d of multiport board\n",
> - controller_index);
> + pr_info("%s: Controller %d of multiport board\n",
> + dev->name, controller_index);
> tp->mtable = last_mediatable;
> ee_data = last_ee_data;
> goto subsequent_board;
> } else
> - dev_info(&dev->dev,
> - "Missing EEPROM, this interface may not work correctly!\n");
> + pr_info("%s: Missing EEPROM, this interface may not work correctly!\n",
> + dev->name);
> return;
> }
> /* Do a fix-up based on the vendor half of the station address prefix. */
> @@ -181,15 +186,14 @@ void __devinit tulip_parse_eeprom(struct net_device *dev)
> i++; /* An Accton EN1207, not an outlaw Maxtech. */
> memcpy(ee_data + 26, eeprom_fixups[i].newtable,
> sizeof(eeprom_fixups[i].newtable));
> - dev_info(&dev->dev,
> - "Old format EEPROM on '%s' board. Using substitute media control info\n",
> - eeprom_fixups[i].name);
> + pr_info("%s: Old format EEPROM on '%s' board. Using substitute media control info\n",
> + dev->name, eeprom_fixups[i].name);
> break;
> }
> }
> if (eeprom_fixups[i].name == NULL) { /* No fixup found. */
> - dev_info(&dev->dev,
> - "Old style EEPROM with no media selection information\n");
> + pr_info("%s: Old style EEPROM with no media selection information\n",
> + dev->name);
> return;
> }
> }
> @@ -217,8 +221,8 @@ subsequent_board:
> /* there is no phy information, don't even try to build mtable */
> if (count == 0) {
> if (tulip_debug > 0)
> - dev_warn(&dev->dev,
> - "no phy info, aborting mtable build\n");
> + pr_warning("%s: no phy info, aborting mtable build\n",
> + dev->name);
> return;
> }
>
> @@ -234,8 +238,10 @@ subsequent_board:
> mtable->has_nonmii = mtable->has_mii = mtable->has_reset = 0;
> mtable->csr15dir = mtable->csr15val = 0;
>
> - dev_info(&dev->dev, "EEPROM default media type %s\n",
> - media & 0x0800 ? "Autosense" : medianame[media & MEDIA_MASK]);
> + pr_info("%s: EEPROM default media type %s\n",
> + dev->name,
> + media & 0x0800 ? "Autosense"
> + : medianame[media & MEDIA_MASK]);
> for (i = 0; i < count; i++) {
> struct medialeaf *leaf = &mtable->mleaf[i];
>
> @@ -298,17 +304,17 @@ subsequent_board:
> }
> if (tulip_debug > 1 && leaf->media == 11) {
> unsigned char *bp = leaf->leafdata;
> - dev_info(&dev->dev,
> - "MII interface PHY %d, setup/reset sequences %d/%d long, capabilities %02x %02x\n",
> - bp[0], bp[1], bp[2 + bp[1]*2],
> - bp[5 + bp[2 + bp[1]*2]*2],
> - bp[4 + bp[2 + bp[1]*2]*2]);
> + pr_info("%s: MII interface PHY %d, setup/reset sequences %d/%d long, capabilities %02x %02x\n",
> + dev->name,
> + bp[0], bp[1], bp[2 + bp[1]*2],
> + bp[5 + bp[2 + bp[1]*2]*2],
> + bp[4 + bp[2 + bp[1]*2]*2]);
> }
> - dev_info(&dev->dev,
> - "Index #%d - Media %s (#%d) described by a %s (%d) block\n",
> - i, medianame[leaf->media & 15], leaf->media,
> - leaf->type < ARRAY_SIZE(block_name) ? block_name[leaf->type] : "<unknown>",
> - leaf->type);
> + pr_info("%s: Index #%d - Media %s (#%d) described by a %s (%d) block\n",
> + dev->name,
> + i, medianame[leaf->media & 15], leaf->media,
> + leaf->type < ARRAY_SIZE(block_name) ? block_name[leaf->type] : "<unknown>",
> + leaf->type);
> }
> if (new_advertise)
> tp->sym_advertise = new_advertise;
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages
2010-03-10 19:16 ` Mikael Pettersson
@ 2010-03-13 20:26 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2010-03-13 20:26 UTC (permalink / raw)
To: mikpe; +Cc: joe, netdev, grundler, kyle, linux-kernel
From: Mikael Pettersson <mikpe@it.uu.se>
Date: Wed, 10 Mar 2010 20:16:37 +0100
> Joe Perches writes:
> > Signed-off-by: Joe Perches <joe@perches.com>
...
> Tested-by: Mikael Pettersson <mikpe@it.uu.se>
Applied, thanks everyone.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-03-13 20:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-10 15:33 [BUG 2.6.34-rc1] bogus "(null)" in tulip init messages Mikael Pettersson
2010-03-10 16:41 ` David Miller
2010-03-10 17:34 ` [PATCH] drivers/net/tulip/eeprom.c: fix " Joe Perches
2010-03-10 19:16 ` Mikael Pettersson
2010-03-13 20:26 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).