irda: Remove IRDA_<TYPE> logging macros

[deliverable/linux.git] / drivers / net / irda / mcs7780.c

diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 16f8ffb50e0456aeb52c354dca9deeda8c20a041..6cbd29dcf2d6261e3b8450a342025b6e357dc3a8 100644 (file)
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -197,14 +197,14 @@ error:
 /* Setup a communication between mcs7780 and agilent chip. */
 static inline int mcs_setup_transceiver_agilent(struct mcs_cb *mcs)
 {
-       IRDA_WARNING("This transceiver type is not supported yet.\n");
+       net_warn_ratelimited("This transceiver type is not supported yet\n");
        return 1;
 }
 
 /* Setup a communication between mcs7780 and sharp chip. */
 static inline int mcs_setup_transceiver_sharp(struct mcs_cb *mcs)
 {
-       IRDA_WARNING("This transceiver type is not supported yet.\n");
+       net_warn_ratelimited("This transceiver type is not supported yet\n");
        return 1;
 }
 
@@ -213,9 +213,9 @@ static inline int mcs_setup_transceiver(struct mcs_cb *mcs)
 {
        int ret = 0;
        __u16 rval;
-       char *msg;
+       const char *msg;
 
-       msg = "Basic transceiver setup error.";
+       msg = "Basic transceiver setup error";
 
        /* read value of MODE Register, set the DRIVER and RESET bits
        * and write value back out to MODE Register
@@ -261,7 +261,7 @@ static inline int mcs_setup_transceiver(struct mcs_cb *mcs)
        if(unlikely(ret))
                goto error;
 
-       msg = "transceiver model specific setup error.";
+       msg = "transceiver model specific setup error";
        switch (mcs->transceiver_type) {
        case MCS_TSC_VISHAY:
                ret = mcs_setup_transceiver_vishay(mcs);
@@ -276,8 +276,8 @@ static inline int mcs_setup_transceiver(struct mcs_cb *mcs)
                break;
 
        default:
-               IRDA_WARNING("Unknown transceiver type: %d\n",
-                            mcs->transceiver_type);
+               net_warn_ratelimited("Unknown transceiver type: %d\n",
+                                    mcs->transceiver_type);
                ret = 1;
        }
        if (unlikely(ret))
@@ -300,7 +300,7 @@ static inline int mcs_setup_transceiver(struct mcs_cb *mcs)
                        goto error;
        }
 
-       msg = "transceiver reset.";
+       msg = "transceiver reset";
 
        ret = mcs_get_reg(mcs, MCS_MODE_REG, &rval);
        if (unlikely(ret != 2))
@@ -315,7 +315,7 @@ static inline int mcs_setup_transceiver(struct mcs_cb *mcs)
                return ret;
 
 error:
-       IRDA_ERROR("%s\n", msg);
+       net_err_ratelimited("%s\n", msg);
        return ret;
 }
 
@@ -399,8 +399,8 @@ static void mcs_unwrap_mir(struct mcs_cb *mcs, __u8 *buf, int len)
 
        new_len = len - 2;
        if(unlikely(new_len <= 0)) {
-               IRDA_ERROR("%s short frame length %d\n",
-                            mcs->netdev->name, new_len);
+               net_err_ratelimited("%s short frame length %d\n",
+                                   mcs->netdev->name, new_len);
                ++mcs->netdev->stats.rx_errors;
                ++mcs->netdev->stats.rx_length_errors;
                return;
@@ -409,8 +409,8 @@ static void mcs_unwrap_mir(struct mcs_cb *mcs, __u8 *buf, int len)
        fcs = irda_calc_crc16(~fcs, buf, len);
 
        if(fcs != GOOD_FCS) {
-               IRDA_ERROR("crc error calc 0x%x len %d\n",
-                          fcs, new_len);
+               net_err_ratelimited("crc error calc 0x%x len %d\n",
+                                   fcs, new_len);
                mcs->netdev->stats.rx_errors++;
                mcs->netdev->stats.rx_crc_errors++;
                return;
@@ -452,8 +452,8 @@ static void mcs_unwrap_fir(struct mcs_cb *mcs, __u8 *buf, int len)
 
        new_len = len - 4;
        if(unlikely(new_len <= 0)) {
-               IRDA_ERROR("%s short frame length %d\n",
-                          mcs->netdev->name, new_len);
+               net_err_ratelimited("%s short frame length %d\n",
+                                   mcs->netdev->name, new_len);
                ++mcs->netdev->stats.rx_errors;
                ++mcs->netdev->stats.rx_length_errors;
                return;
@@ -461,7 +461,8 @@ static void mcs_unwrap_fir(struct mcs_cb *mcs, __u8 *buf, int len)
 
        fcs = ~(crc32_le(~0, buf, new_len));
        if(fcs != get_unaligned_le32(buf + new_len)) {
-               IRDA_ERROR("crc error calc 0x%x len %d\n", fcs, new_len);
+               net_err_ratelimited("crc error calc 0x%x len %d\n",
+                                   fcs, new_len);
                mcs->netdev->stats.rx_errors++;
                mcs->netdev->stats.rx_crc_errors++;
                return;
@@ -583,7 +584,7 @@ static int mcs_speed_change(struct mcs_cb *mcs)
        } while(cnt++ < 100 && (rval & MCS_IRINTX));
 
        if (cnt > 100) {
-               IRDA_ERROR("unable to change speed\n");
+               net_err_ratelimited("unable to change speed\n");
                ret = -EIO;
                goto error;
        }
@@ -634,8 +635,8 @@ static int mcs_speed_change(struct mcs_cb *mcs)
 
                default:
                        ret = 1;
-                       IRDA_WARNING("Unknown transceiver type: %d\n",
-                                    mcs->transceiver_type);
+                       net_warn_ratelimited("Unknown transceiver type: %d\n",
+                                            mcs->transceiver_type);
                }
        if (unlikely(ret))
                goto error;
@@ -731,7 +732,7 @@ static int mcs_net_open(struct net_device *netdev)
        sprintf(hwname, "usb#%d", mcs->usbdev->devnum);
        mcs->irlap = irlap_open(netdev, &mcs->qos, hwname);
        if (!mcs->irlap) {
-               IRDA_ERROR("mcs7780: irlap_open failed\n");
+               net_err_ratelimited("mcs7780: irlap_open failed\n");
                goto error2;
        }
 
@@ -851,7 +852,7 @@ static netdev_tx_t mcs_hard_xmit(struct sk_buff *skb,
                          mcs->out_buf, wraplen, mcs_send_irq, mcs);
 
        if ((ret = usb_submit_urb(mcs->tx_urb, GFP_ATOMIC))) {
-               IRDA_ERROR("failed tx_urb: %d\n", ret);
+               net_err_ratelimited("failed tx_urb: %d\n", ret);
                switch (ret) {
                case -ENODEV:
                case -EPIPE:
@@ -899,7 +900,7 @@ static int mcs_probe(struct usb_interface *intf,
 
        ret = usb_reset_configuration(udev);
        if (ret != 0) {
-               IRDA_ERROR("mcs7780: usb reset configuration failed\n");
+               net_err_ratelimited("mcs7780: usb reset configuration failed\n");
                goto error2;
        }