Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[mirror_ubuntu-zesty-kernel.git] / net / irda / irlan / irlan_eth.c

diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index dc13f1a45f2f7741d98d35d5299e78d4167f2d60..fcfbe579434ae8d4ffb989f0ac82b250512c5637 100644 (file)
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -110,8 +110,6 @@ static int irlan_eth_open(struct net_device *dev)
 {
        struct irlan_cb *self = netdev_priv(dev);
 
-       IRDA_DEBUG(2, "%s()\n", __func__);
-
        /* Ready to play! */
        netif_stop_queue(dev); /* Wait until data link is ready */
 
@@ -137,8 +135,6 @@ static int irlan_eth_close(struct net_device *dev)
 {
        struct irlan_cb *self = netdev_priv(dev);
 
-       IRDA_DEBUG(2, "%s()\n", __func__);
-
        /* Stop device */
        netif_stop_queue(dev);
 
@@ -231,8 +227,8 @@ int irlan_eth_receive(void *instance, void *sap, struct sk_buff *skb)
                return 0;
        }
        if (skb->len < ETH_HLEN) {
-               IRDA_DEBUG(0, "%s() : IrLAN frame too short (%d)\n",
-                          __func__, skb->len);
+               pr_debug("%s() : IrLAN frame too short (%d)\n",
+                        __func__, skb->len);
                dev->stats.rx_dropped++;
                dev_kfree_skb(skb);
                return 0;
@@ -281,9 +277,9 @@ void irlan_eth_flow_indication(void *instance, void *sap, LOCAL_FLOW flow)
 
        IRDA_ASSERT(dev != NULL, return;);
 
-       IRDA_DEBUG(0, "%s() : flow %s ; running %d\n", __func__,
-                  flow == FLOW_STOP ? "FLOW_STOP" : "FLOW_START",
-                  netif_running(dev));
+       pr_debug("%s() : flow %s ; running %d\n", __func__,
+                flow == FLOW_STOP ? "FLOW_STOP" : "FLOW_START",
+                netif_running(dev));
 
        switch (flow) {
        case FLOW_STOP:
@@ -310,32 +306,30 @@ static void irlan_eth_set_multicast_list(struct net_device *dev)
 {
        struct irlan_cb *self = netdev_priv(dev);
 
-       IRDA_DEBUG(2, "%s()\n", __func__);
-
        /* Check if data channel has been connected yet */
        if (self->client.state != IRLAN_DATA) {
-               IRDA_DEBUG(1, "%s(), delaying!\n", __func__);
+               pr_debug("%s(), delaying!\n", __func__);
                return;
        }
 
        if (dev->flags & IFF_PROMISC) {
                /* Enable promiscuous mode */
-               IRDA_WARNING("Promiscuous mode not implemented by IrLAN!\n");
+               net_warn_ratelimited("Promiscuous mode not implemented by IrLAN!\n");
        } else if ((dev->flags & IFF_ALLMULTI) ||
                 netdev_mc_count(dev) > HW_MAX_ADDRS) {
                /* Disable promiscuous mode, use normal mode. */
-               IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __func__);
+               pr_debug("%s(), Setting multicast filter\n", __func__);
                /* hardware_set_filter(NULL); */
 
                irlan_set_multicast_filter(self, TRUE);
        } else if (!netdev_mc_empty(dev)) {
-               IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __func__);
+               pr_debug("%s(), Setting multicast filter\n", __func__);
                /* Walk the address list, and load the filter */
                /* hardware_set_filter(dev->mc_list); */
 
                irlan_set_multicast_filter(self, TRUE);
        } else {
-               IRDA_DEBUG(4, "%s(), Clearing multicast filter\n", __func__);
+               pr_debug("%s(), Clearing multicast filter\n", __func__);
                irlan_set_multicast_filter(self, FALSE);
        }