tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

qla3xxx: Cleanup: Fix link print statements.

Removed debug print statements and improved conditionals around informational statements.

Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Ron Mercer and committed by David S. Miller 0f807044 e1b86d84

+5 -14
unified split
+5 -14
drivers/net/qla3xxx.c
··· 1515 linkState = LS_UP; 1516 } else { 1517 linkState = LS_DOWN; 1518 - if (netif_msg_link(qdev)) 1519 - printk(KERN_WARNING PFX 1520 - "%s: Link is down.\n", qdev->ndev->name); 1521 } 1522 return linkState; 1523 } ··· 1578 ql_mac_enable(qdev, 1); 1579 } 1580 1581 - if (netif_msg_link(qdev)) 1582 - printk(KERN_DEBUG PFX 1583 - "%s: Change port_link_state LS_DOWN to LS_UP.\n", 1584 - qdev->ndev->name); 1585 qdev->port_link_state = LS_UP; 1586 netif_start_queue(qdev->ndev); 1587 netif_carrier_on(qdev->ndev); ··· 1648 /* Fall Through */ 1649 1650 case LS_DOWN: 1651 - if (netif_msg_link(qdev)) 1652 - printk(KERN_DEBUG PFX 1653 - "%s: port_link_state = LS_DOWN.\n", 1654 - qdev->ndev->name); 1655 if (curr_link_state == LS_UP) { 1656 if (netif_msg_link(qdev)) 1657 - printk(KERN_DEBUG PFX 1658 - "%s: curr_link_state = LS_UP.\n", 1659 qdev->ndev->name); 1660 if (ql_is_auto_neg_complete(qdev)) 1661 ql_finish_auto_neg(qdev); ··· 1658 if (qdev->port_link_state == LS_UP) 1659 ql_link_down_detect_clear(qdev); 1660 1661 } 1662 break; 1663 ··· 1667 * See if the link is currently down or went down and came 1668 * back up 1669 */ 1670 - if ((curr_link_state == LS_DOWN) || ql_link_down_detect(qdev)) { 1671 if (netif_msg_link(qdev)) 1672 printk(KERN_INFO PFX "%s: Link is down.\n", 1673 qdev->ndev->name); 1674 qdev->port_link_state = LS_DOWN; 1675 } 1676 break; 1677 } 1678 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
··· 1515 linkState = LS_UP; 1516 } else { 1517 linkState = LS_DOWN; 1518 } 1519 return linkState; 1520 } ··· 1581 ql_mac_enable(qdev, 1); 1582 } 1583 1584 qdev->port_link_state = LS_UP; 1585 netif_start_queue(qdev->ndev); 1586 netif_carrier_on(qdev->ndev); ··· 1655 /* Fall Through */ 1656 1657 case LS_DOWN: 1658 if (curr_link_state == LS_UP) { 1659 if (netif_msg_link(qdev)) 1660 + printk(KERN_INFO PFX "%s: Link is up.\n", 1661 qdev->ndev->name); 1662 if (ql_is_auto_neg_complete(qdev)) 1663 ql_finish_auto_neg(qdev); ··· 1670 if (qdev->port_link_state == LS_UP) 1671 ql_link_down_detect_clear(qdev); 1672 1673 + qdev->port_link_state = LS_UP; 1674 } 1675 break; 1676 ··· 1678 * See if the link is currently down or went down and came 1679 * back up 1680 */ 1681 + if (curr_link_state == LS_DOWN) { 1682 if (netif_msg_link(qdev)) 1683 printk(KERN_INFO PFX "%s: Link is down.\n", 1684 qdev->ndev->name); 1685 qdev->port_link_state = LS_DOWN; 1686 } 1687 + if (ql_link_down_detect(qdev)) 1688 + qdev->port_link_state = LS_DOWN; 1689 break; 1690 } 1691 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);