ctu_usbcan: adjust error reporting to build with actual Linux kernels.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/kernel/2.6/drivers/net/can/usb/ctu_usbcan.c b/kernel/2.6/drivers/net/can/usb/ctu_usbcan.c
index ccf1afa10351f4f8771be6d5cb5001332ab8c1c0..4862dad92f968620e0a4433ea0c744fcf66c46f5 100644 (file)
--- a/kernel/2.6/drivers/net/can/usb/ctu_usbcan.c
+++ b/kernel/2.6/drivers/net/can/usb/ctu_usbcan.c
@@ -123,7 +123,7 @@ static int get_bittiming_constants(struct ctu_usbcan_usb *dev)
        usbbuf = kzalloc(sizeof(u8)*USBCAN_BITTIMING_CONST_SIZE, GFP_KERNEL);
 
        if(!usbbuf){
-               err("Error allocating receive buffer for bittiming constants\n");
+               netdev_err(dev->netdev, "Error allocating receive buffer for bittiming constants\n");
                return 1;
        }
        
@@ -187,7 +187,7 @@ static int ctu_usbcan_set_bittiming(struct net_device *netdev)
        usbbuf = kzalloc(sizeof(u8)*USBCAN_BITTIMING_SIZE, GFP_KERNEL);
 
        if(!usbbuf){
-               err("Error allocating transmit buffer for set bittiming\n");
+               netdev_err(netdev, "Error allocating transmit buffer for set bittiming\n");
                return 1;
        }       
        
@@ -215,7 +215,7 @@ static int ctu_usbcan_set_bittiming(struct net_device *netdev)
                return 0;
        }
        else{
-               err("Could not set bittiming\n");
+               netdev_err(netdev, "Could not set bittiming\n");
                return retval;
        }
 
@@ -231,7 +231,7 @@ static void ctu_usbcan_tx_callback(struct urb *urb){
                return;
 
        if (urb->status != 0){
-               err("TX callback: error");
+               netdev_err(m->dev->netdev, "TX callback: error");
                return;
        }
 
@@ -261,7 +261,7 @@ static void ctu_usbcan_rx_callback(struct urb *urb)
 
 
        if(urb->status != 0){
-               err("RX callback: error");
+               netdev_err(m->dev->netdev, "RX callback: error");
                return;
        }
 
@@ -325,7 +325,7 @@ static netdev_tx_t ctu_usbcan_start_xmit(struct sk_buff *skb, struct net_device
        /* send*/ 
        retval = usb_submit_urb(m->u, GFP_ATOMIC);
        if (retval){
-               err("Error submitting URB: %d", retval);
+               netdev_err(netdev, "Error submitting URB: %d", retval);
                can_free_echo_skb(netdev, m->echo_index);
                usbcan_usb_message_move_list(dev, m, &dev->tx_idle_list);
                dev_kfree_skb(skb);
@@ -405,7 +405,8 @@ void usbcan_kthread_read_handler(struct ctu_usbcan_usb *dev, struct usbcan_messa
        u8 *ptr;
        int i, len, retval;
        u16 flags = 0;
-       struct net_device_stats *stats = &m->dev->netdev->stats;
+       struct net_device *netdev = m->dev->netdev;
+       struct net_device_stats *stats = &netdev->stats;
 
 
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32)
@@ -417,7 +418,7 @@ void usbcan_kthread_read_handler(struct ctu_usbcan_usb *dev, struct usbcan_messa
 #endif
 
        if (skb == NULL){
-               err("RX: error alloc skb\n");
+               netdev_err(netdev, "RX: error alloc skb\n");
                return;
        }
 
@@ -453,7 +454,7 @@ void usbcan_kthread_read_handler(struct ctu_usbcan_usb *dev, struct usbcan_messa
        usbcan_usb_message_move_list(dev, m, &dev->rx_pend_list);
        retval = usb_submit_urb (m->u, GFP_KERNEL);
        if (retval<0) {
-               err("URB error %d\n", retval);
+               netdev_err(netdev, "URB error %d\n", retval);
        }
 
 
@@ -508,13 +509,13 @@ int usbcan_kthread(void *data)
                m = kzalloc(sizeof(struct usbcan_message), GFP_KERNEL);
                
                if (!u){
-                       err("Error allocating usb receive urb");
+                       netdev_err(dev->netdev, "Error allocating usb receive urb");
                        goto exit;
                }
 
                if(!m) {
                        usb_free_urb(u);
-                       err("Error allocating receive usbcan_message");
+                       netdev_err(dev->netdev, "Error allocating receive usbcan_message");
                        goto exit;
                }
                m->u = u;
@@ -535,13 +536,13 @@ int usbcan_kthread(void *data)
                m = kzalloc(sizeof(struct usbcan_message), GFP_KERNEL);
 
                if (!u){
-                       err("Error allocating usb transmit urb");
+                       netdev_err(dev->netdev, "Error allocating usb transmit urb");
                        goto exit;
                }
        
                if(!m) {
                        usb_free_urb(u);
-                       err("Error allocating transmit usbcan_message");
+                       netdev_err(dev->netdev, "Error allocating transmit usbcan_message");
                        goto exit;
                }
                m->u = u;
@@ -565,7 +566,7 @@ int usbcan_kthread(void *data)
 
                retval=usb_submit_urb(m->u, GFP_KERNEL);
                if (retval){
-                       err("Error submitting URB: %d", retval);
+                       netdev_err(dev->netdev, "Error submitting URB: %d", retval);
                        goto exit;
                }
        }
@@ -713,7 +714,7 @@ static int ctu_usbcan_probe(struct usb_interface *intf,
                }
        }
        if (!(dev->bulk_in_endpointAddr && dev->bulk_out_endpointAddr)) {
-               err("Could not find both bulk-in and bulk-out endpoints");
+               dev_err(&intf->dev, "Could not find both bulk-in and bulk-out endpoints");
                goto exit;
        }
 
@@ -722,7 +723,7 @@ static int ctu_usbcan_probe(struct usb_interface *intf,
        SET_NETDEV_DEV(netdev, &intf->dev);
 
        if (get_bittiming_constants(dev)){
-               err("Could not get bittiming constants\n");
+               dev_err(&intf->dev, "Could not get bittiming constants\n");
                goto exit;
        }
 
@@ -780,7 +781,7 @@ static int __init ctu_usbcan_init(void)
        /* register this driver with the USB subsystem */
        result = usb_register(&ctu_usbcan_driver);
        if (result)
-               err("usb_register failed. Error number %d", result);
+               pr_err("usb_register failed. Error number %d", result);
 
        return result;
 }