Merge tag 'linux-can-next-for-4.3-20150820' of git://git.kernel.org/pub/scm/linux...

Marc Kleine-Budde says:

====================
this is a pull request of a two patches for net-next.

The first patch is by Nik Nyby and fixes a typo in a function name. The
second patch by Lucas Stach demotes register output to debug level.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index b1e8d729851cbb5173c1bbec2b34c4893b2ff595..c83f0f03482ba1d2d9f2b121d2c844af29432f3c 100644 (file)
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -805,7 +805,7 @@ static void flexcan_set_bittiming(struct net_device *dev)
        if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
                reg |= FLEXCAN_CTRL_SMP;
 
-       netdev_info(dev, "writing ctrl=0x%08x\n", reg);
+       netdev_dbg(dev, "writing ctrl=0x%08x\n", reg);
        flexcan_write(reg, &regs->ctrl);
 
        /* print chip status */

diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index 8b4d3e6875eb17e6bca38c812132953d0c5ce2c2..5eee62badf45457798c2fabe5005faa26c6286e2 100644 (file)
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -162,7 +162,7 @@ struct gs_can {
        struct can_bittiming_const bt_const;
        unsigned int channel;   /* channel number */
 
-       /* This lock prevents a race condition between xmit and recieve. */
+       /* This lock prevents a race condition between xmit and receive. */
        spinlock_t tx_ctx_lock;
        struct gs_tx_context tx_context[GS_MAX_TX_URBS];
 
@@ -274,7 +274,7 @@ static void gs_update_state(struct gs_can *dev, struct can_frame *cf)
        }
 }
 
-static void gs_usb_recieve_bulk_callback(struct urb *urb)
+static void gs_usb_receive_bulk_callback(struct urb *urb)
 {
        struct gs_usb *usbcan = urb->context;
        struct gs_can *dev;
@@ -376,7 +376,7 @@ static void gs_usb_recieve_bulk_callback(struct urb *urb)
                          usb_rcvbulkpipe(usbcan->udev, GSUSB_ENDPOINT_IN),
                          hf,
                          sizeof(struct gs_host_frame),
-                         gs_usb_recieve_bulk_callback,
+                         gs_usb_receive_bulk_callback,
                          usbcan
                          );
 
@@ -605,7 +605,7 @@ static int gs_can_open(struct net_device *netdev)
                                                          GSUSB_ENDPOINT_IN),
                                          buf,
                                          sizeof(struct gs_host_frame),
-                                         gs_usb_recieve_bulk_callback,
+                                         gs_usb_receive_bulk_callback,
                                          parent);
                        urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;