Commit a4785ef8 authored by Ioana Ciornei's avatar Ioana Ciornei Committed by Greg Kroah-Hartman

staging: gdm724x: properly indent to match open paranthesis

Indent parameters and arguments passed to function calls to match
open paranthesis
Signed-off-by: default avatarIoana Ciornei <ciorneiioana@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fb1dc957
...@@ -162,11 +162,11 @@ static int gdm_lte_emulate_arp(struct sk_buff *skb_in, u32 nic_type) ...@@ -162,11 +162,11 @@ static int gdm_lte_emulate_arp(struct sk_buff *skb_in, u32 nic_type)
skb_reserve(skb_out, NET_IP_ALIGN); skb_reserve(skb_out, NET_IP_ALIGN);
memcpy(skb_put(skb_out, mac_header_len), mac_header_data, memcpy(skb_put(skb_out, mac_header_len), mac_header_data,
mac_header_len); mac_header_len);
memcpy(skb_put(skb_out, sizeof(struct arphdr)), arp_out, memcpy(skb_put(skb_out, sizeof(struct arphdr)), arp_out,
sizeof(struct arphdr)); sizeof(struct arphdr));
memcpy(skb_put(skb_out, sizeof(struct arpdata)), arp_data_out, memcpy(skb_put(skb_out, sizeof(struct arpdata)), arp_data_out,
sizeof(struct arpdata)); sizeof(struct arpdata));
skb_out->protocol = ((struct ethhdr *)mac_header_data)->h_proto; skb_out->protocol = ((struct ethhdr *)mac_header_data)->h_proto;
skb_out->dev = skb_in->dev; skb_out->dev = skb_in->dev;
...@@ -300,13 +300,13 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in, u32 nic_type) ...@@ -300,13 +300,13 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in, u32 nic_type)
memcpy(&ipv6_out, ipv6_in, sizeof(struct ipv6hdr)); memcpy(&ipv6_out, ipv6_in, sizeof(struct ipv6hdr));
memcpy(ipv6_out.saddr.in6_u.u6_addr8, &na.target_address, 16); memcpy(ipv6_out.saddr.in6_u.u6_addr8, &na.target_address, 16);
memcpy(ipv6_out.daddr.in6_u.u6_addr8, memcpy(ipv6_out.daddr.in6_u.u6_addr8,
ipv6_in->saddr.in6_u.u6_addr8, 16); ipv6_in->saddr.in6_u.u6_addr8, 16);
ipv6_out.payload_len = htons(sizeof(struct icmp6hdr) + ipv6_out.payload_len = htons(sizeof(struct icmp6hdr) +
sizeof(struct neighbour_advertisement)); sizeof(struct neighbour_advertisement));
memcpy(icmp_na, &icmp6_out, sizeof(struct icmp6hdr)); memcpy(icmp_na, &icmp6_out, sizeof(struct icmp6hdr));
memcpy(icmp_na + sizeof(struct icmp6hdr), &na, memcpy(icmp_na + sizeof(struct icmp6hdr), &na,
sizeof(struct neighbour_advertisement)); sizeof(struct neighbour_advertisement));
icmp6_out.icmp6_cksum = icmp6_checksum(&ipv6_out, icmp6_out.icmp6_cksum = icmp6_checksum(&ipv6_out,
(u16 *)icmp_na, sizeof(icmp_na)); (u16 *)icmp_na, sizeof(icmp_na));
...@@ -326,13 +326,13 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in, u32 nic_type) ...@@ -326,13 +326,13 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in, u32 nic_type)
skb_reserve(skb_out, NET_IP_ALIGN); skb_reserve(skb_out, NET_IP_ALIGN);
memcpy(skb_put(skb_out, mac_header_len), mac_header_data, memcpy(skb_put(skb_out, mac_header_len), mac_header_data,
mac_header_len); mac_header_len);
memcpy(skb_put(skb_out, sizeof(struct ipv6hdr)), &ipv6_out, memcpy(skb_put(skb_out, sizeof(struct ipv6hdr)), &ipv6_out,
sizeof(struct ipv6hdr)); sizeof(struct ipv6hdr));
memcpy(skb_put(skb_out, sizeof(struct icmp6hdr)), &icmp6_out, memcpy(skb_put(skb_out, sizeof(struct icmp6hdr)), &icmp6_out,
sizeof(struct icmp6hdr)); sizeof(struct icmp6hdr));
memcpy(skb_put(skb_out, sizeof(struct neighbour_advertisement)), &na, memcpy(skb_put(skb_out, sizeof(struct neighbour_advertisement)), &na,
sizeof(struct neighbour_advertisement)); sizeof(struct neighbour_advertisement));
skb_out->protocol = ((struct ethhdr *)mac_header_data)->h_proto; skb_out->protocol = ((struct ethhdr *)mac_header_data)->h_proto;
skb_out->dev = skb_in->dev; skb_out->dev = skb_in->dev;
...@@ -530,7 +530,7 @@ static int gdm_lte_event_send(struct net_device *dev, char *buf, int len) ...@@ -530,7 +530,7 @@ static int gdm_lte_event_send(struct net_device *dev, char *buf, int len)
} }
static void gdm_lte_event_rcv(struct net_device *dev, u16 type, static void gdm_lte_event_rcv(struct net_device *dev, u16 type,
void *msg, int len) void *msg, int len)
{ {
struct nic *nic = netdev_priv(dev); struct nic *nic = netdev_priv(dev);
...@@ -572,7 +572,7 @@ static u8 find_dev_index(u32 nic_type) ...@@ -572,7 +572,7 @@ static u8 find_dev_index(u32 nic_type)
} }
static void gdm_lte_netif_rx(struct net_device *dev, char *buf, static void gdm_lte_netif_rx(struct net_device *dev, char *buf,
int len, int flagged_nic_type) int len, int flagged_nic_type)
{ {
u32 nic_type; u32 nic_type;
struct nic *nic; struct nic *nic;
...@@ -697,9 +697,9 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len) ...@@ -697,9 +697,9 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len)
u8 index; u8 index;
hci_len = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev), hci_len = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev),
multi_sdu->len); multi_sdu->len);
num_packet = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev), num_packet = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev),
multi_sdu->num_packet); multi_sdu->num_packet);
for (i = 0; i < num_packet; i++) { for (i = 0; i < num_packet; i++) {
sdu = (struct sdu *)data; sdu = (struct sdu *)data;
...@@ -724,7 +724,7 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len) ...@@ -724,7 +724,7 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len)
if (index < MAX_NIC_TYPE) { if (index < MAX_NIC_TYPE) {
dev = phy_dev->dev[index]; dev = phy_dev->dev[index];
gdm_lte_netif_rx(dev, (char *)sdu->data, gdm_lte_netif_rx(dev, (char *)sdu->data,
(int)(hci_len-12), nic_type); (int)(hci_len - 12), nic_type);
} else { } else {
pr_err("rx sdu invalid nic_type :%x\n", nic_type); pr_err("rx sdu invalid nic_type :%x\n", nic_type);
} }
...@@ -772,7 +772,7 @@ static int gdm_lte_receive_pkt(struct phy_dev *phy_dev, char *buf, int len) ...@@ -772,7 +772,7 @@ static int gdm_lte_receive_pkt(struct phy_dev *phy_dev, char *buf, int len)
return ret; return ret;
cmd_evt = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev), cmd_evt = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev),
hci->cmd_evt); hci->cmd_evt);
dev = phy_dev->dev[0]; dev = phy_dev->dev[0];
if (dev == NULL) if (dev == NULL)
...@@ -839,7 +839,7 @@ static struct net_device_ops gdm_netdev_ops = { ...@@ -839,7 +839,7 @@ static struct net_device_ops gdm_netdev_ops = {
static u8 gdm_lte_macaddr[ETH_ALEN] = {0x00, 0x0a, 0x3b, 0x00, 0x00, 0x00}; static u8 gdm_lte_macaddr[ETH_ALEN] = {0x00, 0x0a, 0x3b, 0x00, 0x00, 0x00};
static void form_mac_address(u8 *dev_addr, u8 *nic_src, u8 *nic_dest, static void form_mac_address(u8 *dev_addr, u8 *nic_src, u8 *nic_dest,
u8 *mac_address, u8 index) u8 *mac_address, u8 index)
{ {
/* Form the dev_addr */ /* Form the dev_addr */
if (!mac_address) if (!mac_address)
......
...@@ -271,7 +271,7 @@ static void gdm_mux_rcv_complete(struct urb *urb) ...@@ -271,7 +271,7 @@ static void gdm_mux_rcv_complete(struct urb *urb)
if (urb->status) { if (urb->status) {
if (mux_dev->usb_state == PM_NORMAL) if (mux_dev->usb_state == PM_NORMAL)
dev_err(&urb->dev->dev, "%s: urb status error %d\n", dev_err(&urb->dev->dev, "%s: urb status error %d\n",
__func__, urb->status); __func__, urb->status);
put_rx_struct(rx, r); put_rx_struct(rx, r);
} else { } else {
r->len = r->urb->actual_length; r->len = r->urb->actual_length;
......
...@@ -63,7 +63,7 @@ static void do_rx(struct work_struct *work); ...@@ -63,7 +63,7 @@ static void do_rx(struct work_struct *work);
static int gdm_usb_recv(void *priv_dev, static int gdm_usb_recv(void *priv_dev,
int (*cb)(void *cb_data, int (*cb)(void *cb_data,
void *data, int len, int context), void *data, int len, int context),
void *cb_data, void *cb_data,
int context); int context);
...@@ -80,7 +80,7 @@ static int request_mac_address(struct lte_udev *udev) ...@@ -80,7 +80,7 @@ static int request_mac_address(struct lte_udev *udev)
hci->data[0] = MAC_ADDRESS; hci->data[0] = MAC_ADDRESS;
ret = usb_bulk_msg(usbdev, usb_sndbulkpipe(usbdev, 2), buf, 5, ret = usb_bulk_msg(usbdev, usb_sndbulkpipe(usbdev, 2), buf, 5,
&actual, 1000); &actual, 1000);
udev->request_mac_addr = 1; udev->request_mac_addr = 1;
...@@ -376,7 +376,7 @@ static int set_mac_address(u8 *data, void *arg) ...@@ -376,7 +376,7 @@ static int set_mac_address(u8 *data, void *arg)
memcpy(mac_address, tlv->data, tlv->len); memcpy(mac_address, tlv->data, tlv->len);
if (register_lte_device(phy_dev, if (register_lte_device(phy_dev,
&udev->intf->dev, mac_address) < 0) &udev->intf->dev, mac_address) < 0)
pr_err("register lte device failed\n"); pr_err("register lte device failed\n");
udev->request_mac_addr = 0; udev->request_mac_addr = 0;
...@@ -406,7 +406,7 @@ static void do_rx(struct work_struct *work) ...@@ -406,7 +406,7 @@ static void do_rx(struct work_struct *work)
break; break;
} }
r = list_entry(rx->to_host_list.next, r = list_entry(rx->to_host_list.next,
struct usb_rx, to_host_list); struct usb_rx, to_host_list);
list_del(&r->to_host_list); list_del(&r->to_host_list);
spin_unlock_irqrestore(&rx->to_host_lock, flags); spin_unlock_irqrestore(&rx->to_host_lock, flags);
...@@ -481,7 +481,7 @@ static void gdm_usb_rcv_complete(struct urb *urb) ...@@ -481,7 +481,7 @@ static void gdm_usb_rcv_complete(struct urb *urb)
} else { } else {
if (urb->status && udev->usb_state == PM_NORMAL) if (urb->status && udev->usb_state == PM_NORMAL)
dev_err(&urb->dev->dev, "%s: urb status error %d\n", dev_err(&urb->dev->dev, "%s: urb status error %d\n",
__func__, urb->status); __func__, urb->status);
put_rx_struct(rx, r); put_rx_struct(rx, r);
} }
...@@ -491,7 +491,7 @@ static void gdm_usb_rcv_complete(struct urb *urb) ...@@ -491,7 +491,7 @@ static void gdm_usb_rcv_complete(struct urb *urb)
static int gdm_usb_recv(void *priv_dev, static int gdm_usb_recv(void *priv_dev,
int (*cb)(void *cb_data, int (*cb)(void *cb_data,
void *data, int len, int context), void *data, int len, int context),
void *cb_data, void *cb_data,
int context) int context)
{ {
...@@ -711,8 +711,8 @@ static void do_tx(struct work_struct *work) ...@@ -711,8 +711,8 @@ static void do_tx(struct work_struct *work)
#define SDU_PARAM_LEN 12 #define SDU_PARAM_LEN 12
static int gdm_usb_sdu_send(void *priv_dev, void *data, int len, static int gdm_usb_sdu_send(void *priv_dev, void *data, int len,
unsigned int dftEpsId, unsigned int epsId, unsigned int dftEpsId, unsigned int epsId,
void (*cb)(void *data), void *cb_data, void (*cb)(void *data), void *cb_data,
int dev_idx, int nic_type) int dev_idx, int nic_type)
{ {
struct lte_udev *udev = priv_dev; struct lte_udev *udev = priv_dev;
...@@ -769,7 +769,7 @@ static int gdm_usb_sdu_send(void *priv_dev, void *data, int len, ...@@ -769,7 +769,7 @@ static int gdm_usb_sdu_send(void *priv_dev, void *data, int len,
} }
static int gdm_usb_hci_send(void *priv_dev, void *data, int len, static int gdm_usb_hci_send(void *priv_dev, void *data, int len,
void (*cb)(void *data), void *cb_data) void (*cb)(void *data), void *cb_data)
{ {
struct lte_udev *udev = priv_dev; struct lte_udev *udev = priv_dev;
struct tx_cxt *tx = &udev->tx; struct tx_cxt *tx = &udev->tx;
...@@ -810,7 +810,7 @@ static struct gdm_endian *gdm_usb_get_endian(void *priv_dev) ...@@ -810,7 +810,7 @@ static struct gdm_endian *gdm_usb_get_endian(void *priv_dev)
} }
static int gdm_usb_probe(struct usb_interface *intf, static int gdm_usb_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
int ret = 0; int ret = 0;
struct phy_dev *phy_dev = NULL; struct phy_dev *phy_dev = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment