From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756072AbbJ1SNm (ORCPT ); Wed, 28 Oct 2015 14:13:42 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:32992 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754946AbbJ1SNl (ORCPT ); Wed, 28 Oct 2015 14:13:41 -0400 From: Bogicevic Sasa To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, Bogicevic Sasa Subject: [PATCH 2/2] drivers:staging:gdm724x Fix Alignment should match open parenthesis Date: Wed, 28 Oct 2015 19:13:24 +0100 Message-Id: <1446056004-6092-1-git-send-email-brutallesale@gmail.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This fixes all Alignment should match open parenthesis messages from checkpatch.pl Signed-off-by: Bogicevic Sasa --- drivers/staging/gdm724x/gdm_lte.c | 69 +++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 24 deletions(-) diff --git a/drivers/staging/gdm724x/gdm_lte.c b/drivers/staging/gdm724x/gdm_lte.c index a8d2cff..a28e0d1 100644 --- a/drivers/staging/gdm724x/gdm_lte.c +++ b/drivers/staging/gdm724x/gdm_lte.c @@ -161,12 +161,15 @@ static int gdm_lte_emulate_arp(struct sk_buff *skb_in, u32 nic_type) return -ENOMEM; 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); - memcpy(skb_put(skb_out, sizeof(struct arphdr)), arp_out, - sizeof(struct arphdr)); - memcpy(skb_put(skb_out, sizeof(struct arpdata)), arp_data_out, - sizeof(struct arpdata)); + memcpy( + skb_put(skb_out, sizeof(struct arphdr)), + arp_out, sizeof(struct arphdr)); + memcpy( + skb_put(skb_out, sizeof(struct arpdata)), + arp_data_out, sizeof(struct arpdata)); skb_out->protocol = ((struct ethhdr *)mac_header_data)->h_proto; skb_out->dev = skb_in->dev; @@ -299,15 +302,16 @@ 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.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_out.payload_len = htons(sizeof(struct icmp6hdr) + sizeof(struct neighbour_advertisement)); memcpy(icmp_na, &icmp6_out, sizeof(struct icmp6hdr)); - memcpy(icmp_na + sizeof(struct icmp6hdr), &na, - sizeof(struct neighbour_advertisement)); - + memcpy( + icmp_na + sizeof(struct icmp6hdr), + &na, sizeof(struct neighbour_advertisement)); icmp6_out.icmp6_cksum = icmp6_checksum(&ipv6_out, (u16 *)icmp_na, sizeof(icmp_na)); } else { @@ -325,13 +329,21 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in, u32 nic_type) return -ENOMEM; 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); - memcpy(skb_put(skb_out, sizeof(struct ipv6hdr)), &ipv6_out, + memcpy( + skb_put(skb_out, sizeof(struct ipv6hdr)), + &ipv6_out, 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)); - memcpy(skb_put(skb_out, sizeof(struct neighbour_advertisement)), &na, + memcpy( + skb_put(skb_out, sizeof(struct neighbour_advertisement)), + &na, sizeof(struct neighbour_advertisement)); skb_out->protocol = ((struct ethhdr *)mac_header_data)->h_proto; @@ -529,7 +541,8 @@ static int gdm_lte_event_send(struct net_device *dev, char *buf, int len) + HCI_HEADER_SIZE); } -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) { struct nic *nic = netdev_priv(dev); @@ -571,8 +584,11 @@ static u8 find_dev_index(u32 nic_type) return index; } -static void gdm_lte_netif_rx(struct net_device *dev, char *buf, - int len, int flagged_nic_type) +static void gdm_lte_netif_rx( + struct net_device *dev, + char *buf, + int len, + int flagged_nic_type) { u32 nic_type; struct nic *nic; @@ -696,10 +712,12 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len) u32 nic_type; u8 index; - hci_len = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev), - multi_sdu->len); - num_packet = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev), - multi_sdu->num_packet); + hci_len = gdm_dev16_to_cpu( + phy_dev->get_endian(phy_dev->priv_dev), + multi_sdu->len); + num_packet = gdm_dev16_to_cpu( + phy_dev->get_endian(phy_dev->priv_dev), + multi_sdu->num_packet); for (i = 0; i < num_packet; i++) { sdu = (struct sdu *)data; @@ -723,7 +741,8 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len) index = find_dev_index(nic_type); if (index < MAX_NIC_TYPE) { 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); } else { pr_err("rx sdu invalid nic_type :%x\n", nic_type); @@ -771,7 +790,8 @@ static int gdm_lte_receive_pkt(struct phy_dev *phy_dev, char *buf, int len) if (!len) 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); dev = phy_dev->dev[0]; @@ -838,8 +858,9 @@ static struct net_device_ops gdm_netdev_ops = { 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, - u8 *mac_address, u8 index) +static void form_mac_address( + u8 *dev_addr, u8 *nic_src, u8 *nic_dest, + u8 *mac_address, u8 index) { /* Form the dev_addr */ if (!mac_address) -- 2.1.4