diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-15 03:07:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-15 03:07:00 -0500 |
commit | 02b1bae5e1c0f810168037be0134685085e95e88 (patch) | |
tree | e33e8a0501e921323208e312541e9fa2f9f063d6 /drivers/net/niu.c | |
parent | 228da6c2e63b3b2064492b24ef83c07bcc48abbd (diff) |
niu: Refinements to kernel logging.
Fix unconditional empty kerne log message every interrupt.
Kill some informational log messages that are superfluous
and anyways occur before the netdev is registered.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/niu.c')
-rw-r--r-- | drivers/net/niu.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index 347788f11c74..5e604e305d95 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
@@ -3204,9 +3204,6 @@ static int fflp_early_init(struct niu *np) | |||
3204 | parent = np->parent; | 3204 | parent = np->parent; |
3205 | err = 0; | 3205 | err = 0; |
3206 | if (!(parent->flags & PARENT_FLGS_CLS_HWINIT)) { | 3206 | if (!(parent->flags & PARENT_FLGS_CLS_HWINIT)) { |
3207 | netif_printk(np, probe, KERN_DEBUG, np->dev, | ||
3208 | "%s() Initting hw on port %u\n", | ||
3209 | __func__, np->port); | ||
3210 | if (np->parent->plat_type != PLAT_TYPE_NIU) { | 3207 | if (np->parent->plat_type != PLAT_TYPE_NIU) { |
3211 | fflp_reset(np); | 3208 | fflp_reset(np); |
3212 | fflp_set_timings(np); | 3209 | fflp_set_timings(np); |
@@ -3248,8 +3245,6 @@ static int fflp_early_init(struct niu *np) | |||
3248 | 3245 | ||
3249 | vlan_tbl_clear(np); | 3246 | vlan_tbl_clear(np); |
3250 | 3247 | ||
3251 | netif_printk(np, probe, KERN_DEBUG, np->dev, | ||
3252 | "%s() Success\n", __func__); | ||
3253 | parent->flags |= PARENT_FLGS_CLS_HWINIT; | 3248 | parent->flags |= PARENT_FLGS_CLS_HWINIT; |
3254 | } | 3249 | } |
3255 | out: | 3250 | out: |
@@ -4246,13 +4241,11 @@ static irqreturn_t niu_interrupt(int irq, void *dev_id) | |||
4246 | v2 = nr64(LDSV2(ldg)); | 4241 | v2 = nr64(LDSV2(ldg)); |
4247 | 4242 | ||
4248 | if (netif_msg_intr(np)) | 4243 | if (netif_msg_intr(np)) |
4249 | pr_cont(" v0[%llx] v1[%llx] v2[%llx]", | 4244 | pr_cont(" v0[%llx] v1[%llx] v2[%llx]\n", |
4250 | (unsigned long long) v0, | 4245 | (unsigned long long) v0, |
4251 | (unsigned long long) v1, | 4246 | (unsigned long long) v1, |
4252 | (unsigned long long) v2); | 4247 | (unsigned long long) v2); |
4253 | 4248 | ||
4254 | pr_cont("\n"); | ||
4255 | |||
4256 | if (unlikely(!v0 && !v1 && !v2)) { | 4249 | if (unlikely(!v0 && !v1 && !v2)) { |
4257 | spin_unlock_irqrestore(&np->lock, flags); | 4250 | spin_unlock_irqrestore(&np->lock, flags); |
4258 | return IRQ_NONE; | 4251 | return IRQ_NONE; |
@@ -8577,9 +8570,6 @@ static int __devinit niu_get_and_validate_port(struct niu *np) | |||
8577 | } | 8570 | } |
8578 | } | 8571 | } |
8579 | 8572 | ||
8580 | netif_printk(np, probe, KERN_DEBUG, np->dev, | ||
8581 | "%s() port[%d] num_ports[%d]\n", | ||
8582 | __func__, np->port, parent->num_ports); | ||
8583 | if (np->port >= parent->num_ports) | 8573 | if (np->port >= parent->num_ports) |
8584 | return -ENODEV; | 8574 | return -ENODEV; |
8585 | 8575 | ||
@@ -8965,9 +8955,6 @@ static int __devinit niu_probe_ports(struct niu *np) | |||
8965 | struct niu_parent *parent = np->parent; | 8955 | struct niu_parent *parent = np->parent; |
8966 | int err, i; | 8956 | int err, i; |
8967 | 8957 | ||
8968 | netif_printk(np, probe, KERN_DEBUG, np->dev, | ||
8969 | "%s() port_phy[%08x]\n", __func__, parent->port_phy); | ||
8970 | |||
8971 | if (parent->port_phy == PORT_PHY_UNKNOWN) { | 8958 | if (parent->port_phy == PORT_PHY_UNKNOWN) { |
8972 | err = walk_phys(np, parent); | 8959 | err = walk_phys(np, parent); |
8973 | if (err) | 8960 | if (err) |
@@ -8988,10 +8975,6 @@ static int __devinit niu_classifier_swstate_init(struct niu *np) | |||
8988 | { | 8975 | { |
8989 | struct niu_classifier *cp = &np->clas; | 8976 | struct niu_classifier *cp = &np->clas; |
8990 | 8977 | ||
8991 | netif_printk(np, probe, KERN_DEBUG, np->dev, | ||
8992 | "%s() num_tcam(%d)\n", | ||
8993 | __func__, np->parent->tcam_num_entries); | ||
8994 | |||
8995 | cp->tcam_top = (u16) np->port; | 8978 | cp->tcam_top = (u16) np->port; |
8996 | cp->tcam_sz = np->parent->tcam_num_entries / np->parent->num_ports; | 8979 | cp->tcam_sz = np->parent->tcam_num_entries / np->parent->num_ports; |
8997 | cp->h1_init = 0xffffffff; | 8980 | cp->h1_init = 0xffffffff; |
@@ -9506,9 +9489,6 @@ static struct niu_parent * __devinit niu_new_parent(struct niu *np, | |||
9506 | struct niu_parent *p; | 9489 | struct niu_parent *p; |
9507 | int i; | 9490 | int i; |
9508 | 9491 | ||
9509 | netif_printk(np, probe, KERN_DEBUG, np->dev, | ||
9510 | "%s() Creating new parent\n", __func__); | ||
9511 | |||
9512 | plat_dev = platform_device_register_simple("niu", niu_parent_index, | 9492 | plat_dev = platform_device_register_simple("niu", niu_parent_index, |
9513 | NULL, 0); | 9493 | NULL, 0); |
9514 | if (IS_ERR(plat_dev)) | 9494 | if (IS_ERR(plat_dev)) |
@@ -9573,10 +9553,6 @@ static struct niu_parent * __devinit niu_get_parent(struct niu *np, | |||
9573 | struct niu_parent *p, *tmp; | 9553 | struct niu_parent *p, *tmp; |
9574 | int port = np->port; | 9554 | int port = np->port; |
9575 | 9555 | ||
9576 | netif_printk(np, probe, KERN_DEBUG, np->dev, | ||
9577 | "%s() platform_type[%u] port[%u]\n", | ||
9578 | __func__, ptype, port); | ||
9579 | |||
9580 | mutex_lock(&niu_parent_lock); | 9556 | mutex_lock(&niu_parent_lock); |
9581 | p = NULL; | 9557 | p = NULL; |
9582 | list_for_each_entry(tmp, &niu_parent_list, list) { | 9558 | list_for_each_entry(tmp, &niu_parent_list, list) { |