diff options
author | Ethan Zonca <e@ethanzonca.com> | 2017-02-24 11:00:34 -0500 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2017-03-03 07:00:07 -0500 |
commit | 540a27aef355e3fd8c598600d4a3c8f92127ee05 (patch) | |
tree | 3b15dbb0eaa15adc425ae33f738afe59248fe038 | |
parent | c919a3069c775c1c876bec55e00b2305d5125caa (diff) |
can: gs_usb: fix coding style
This patch fixes five minor style issues, spaces are between bitwise OR
operators.
Signed-off-by: Ethan Zonca <e@ethanzonca.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r-- | drivers/net/can/usb/gs_usb.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index a0dabd4038ba..300349fe8dc0 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c | |||
@@ -258,7 +258,7 @@ static int gs_cmd_reset(struct gs_usb *gsusb, struct gs_can *gsdev) | |||
258 | rc = usb_control_msg(interface_to_usbdev(intf), | 258 | rc = usb_control_msg(interface_to_usbdev(intf), |
259 | usb_sndctrlpipe(interface_to_usbdev(intf), 0), | 259 | usb_sndctrlpipe(interface_to_usbdev(intf), 0), |
260 | GS_USB_BREQ_MODE, | 260 | GS_USB_BREQ_MODE, |
261 | USB_DIR_OUT|USB_TYPE_VENDOR|USB_RECIP_INTERFACE, | 261 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE, |
262 | gsdev->channel, | 262 | gsdev->channel, |
263 | 0, | 263 | 0, |
264 | dm, | 264 | dm, |
@@ -432,7 +432,7 @@ static int gs_usb_set_bittiming(struct net_device *netdev) | |||
432 | rc = usb_control_msg(interface_to_usbdev(intf), | 432 | rc = usb_control_msg(interface_to_usbdev(intf), |
433 | usb_sndctrlpipe(interface_to_usbdev(intf), 0), | 433 | usb_sndctrlpipe(interface_to_usbdev(intf), 0), |
434 | GS_USB_BREQ_BITTIMING, | 434 | GS_USB_BREQ_BITTIMING, |
435 | USB_DIR_OUT|USB_TYPE_VENDOR|USB_RECIP_INTERFACE, | 435 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE, |
436 | dev->channel, | 436 | dev->channel, |
437 | 0, | 437 | 0, |
438 | dbt, | 438 | dbt, |
@@ -546,7 +546,6 @@ static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb, | |||
546 | hf, | 546 | hf, |
547 | urb->transfer_dma); | 547 | urb->transfer_dma); |
548 | 548 | ||
549 | |||
550 | if (rc == -ENODEV) { | 549 | if (rc == -ENODEV) { |
551 | netif_device_detach(netdev); | 550 | netif_device_detach(netdev); |
552 | } else { | 551 | } else { |
@@ -804,7 +803,7 @@ static struct gs_can *gs_make_candev(unsigned int channel, | |||
804 | rc = usb_control_msg(interface_to_usbdev(intf), | 803 | rc = usb_control_msg(interface_to_usbdev(intf), |
805 | usb_rcvctrlpipe(interface_to_usbdev(intf), 0), | 804 | usb_rcvctrlpipe(interface_to_usbdev(intf), 0), |
806 | GS_USB_BREQ_BT_CONST, | 805 | GS_USB_BREQ_BT_CONST, |
807 | USB_DIR_IN|USB_TYPE_VENDOR|USB_RECIP_INTERFACE, | 806 | USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE, |
808 | channel, | 807 | channel, |
809 | 0, | 808 | 0, |
810 | bt_const, | 809 | bt_const, |
@@ -921,7 +920,7 @@ static int gs_usb_probe(struct usb_interface *intf, | |||
921 | rc = usb_control_msg(interface_to_usbdev(intf), | 920 | rc = usb_control_msg(interface_to_usbdev(intf), |
922 | usb_sndctrlpipe(interface_to_usbdev(intf), 0), | 921 | usb_sndctrlpipe(interface_to_usbdev(intf), 0), |
923 | GS_USB_BREQ_HOST_FORMAT, | 922 | GS_USB_BREQ_HOST_FORMAT, |
924 | USB_DIR_OUT|USB_TYPE_VENDOR|USB_RECIP_INTERFACE, | 923 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE, |
925 | 1, | 924 | 1, |
926 | intf->altsetting[0].desc.bInterfaceNumber, | 925 | intf->altsetting[0].desc.bInterfaceNumber, |
927 | hconf, | 926 | hconf, |
@@ -944,7 +943,7 @@ static int gs_usb_probe(struct usb_interface *intf, | |||
944 | rc = usb_control_msg(interface_to_usbdev(intf), | 943 | rc = usb_control_msg(interface_to_usbdev(intf), |
945 | usb_rcvctrlpipe(interface_to_usbdev(intf), 0), | 944 | usb_rcvctrlpipe(interface_to_usbdev(intf), 0), |
946 | GS_USB_BREQ_DEVICE_CONFIG, | 945 | GS_USB_BREQ_DEVICE_CONFIG, |
947 | USB_DIR_IN|USB_TYPE_VENDOR|USB_RECIP_INTERFACE, | 946 | USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE, |
948 | 1, | 947 | 1, |
949 | intf->altsetting[0].desc.bInterfaceNumber, | 948 | intf->altsetting[0].desc.bInterfaceNumber, |
950 | dconf, | 949 | dconf, |