From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/drivers/staging/gdm724x/gdm_endian.c | 46 +++++++++--------------- kernel/drivers/staging/gdm724x/gdm_endian.h | 11 ------ kernel/drivers/staging/gdm724x/gdm_lte.c | 54 ++++++++++++++-------------- kernel/drivers/staging/gdm724x/gdm_mux.c | 28 +++++++-------- kernel/drivers/staging/gdm724x/gdm_tty.c | 8 ++--- kernel/drivers/staging/gdm724x/gdm_usb.c | 56 ++++++++++++++--------------- kernel/drivers/staging/gdm724x/netlink_k.c | 10 +++--- 7 files changed, 93 insertions(+), 120 deletions(-) (limited to 'kernel/drivers/staging/gdm724x') diff --git a/kernel/drivers/staging/gdm724x/gdm_endian.c b/kernel/drivers/staging/gdm724x/gdm_endian.c index f6cc90ae9..d7144e7af 100644 --- a/kernel/drivers/staging/gdm724x/gdm_endian.c +++ b/kernel/drivers/staging/gdm724x/gdm_endian.c @@ -11,57 +11,45 @@ * GNU General Public License for more details. */ -#include +#include #include "gdm_endian.h" void gdm_set_endian(struct gdm_endian *ed, u8 dev_endian) { - u8 a[2] = {0x12, 0x34}; - u8 b[2] = {0, }; - u16 c = 0x1234; - if (dev_endian == ENDIANNESS_BIG) ed->dev_ed = ENDIANNESS_BIG; else ed->dev_ed = ENDIANNESS_LITTLE; - - memcpy(b, &c, 2); - - if (a[0] != b[0]) - ed->host_ed = ENDIANNESS_LITTLE; - else - ed->host_ed = ENDIANNESS_BIG; - } u16 gdm_cpu_to_dev16(struct gdm_endian *ed, u16 x) { - if (ed->dev_ed == ed->host_ed) - return x; - - return Endian16_Swap(x); + if (ed->dev_ed == ENDIANNESS_LITTLE) + return cpu_to_le16(x); + else + return cpu_to_be16(x); } u16 gdm_dev16_to_cpu(struct gdm_endian *ed, u16 x) { - if (ed->dev_ed == ed->host_ed) - return x; - - return Endian16_Swap(x); + if (ed->dev_ed == ENDIANNESS_LITTLE) + return le16_to_cpu(x); + else + return be16_to_cpu(x); } u32 gdm_cpu_to_dev32(struct gdm_endian *ed, u32 x) { - if (ed->dev_ed == ed->host_ed) - return x; - - return Endian32_Swap(x); + if (ed->dev_ed == ENDIANNESS_LITTLE) + return cpu_to_le32(x); + else + return cpu_to_be32(x); } u32 gdm_dev32_to_cpu(struct gdm_endian *ed, u32 x) { - if (ed->dev_ed == ed->host_ed) - return x; - - return Endian32_Swap(x); + if (ed->dev_ed == ENDIANNESS_LITTLE) + return le32_to_cpu(x); + else + return be32_to_cpu(x); } diff --git a/kernel/drivers/staging/gdm724x/gdm_endian.h b/kernel/drivers/staging/gdm724x/gdm_endian.h index 9b2531ff9..617787083 100644 --- a/kernel/drivers/staging/gdm724x/gdm_endian.h +++ b/kernel/drivers/staging/gdm724x/gdm_endian.h @@ -16,16 +16,6 @@ #include -#define Endian16_Swap(value) \ - ((((u16)((value) & 0x00FF)) << 8) | \ - (((u16)((value) & 0xFF00)) >> 8)) - -#define Endian32_Swap(value) \ - ((((u32)((value) & 0x000000FF)) << 24) | \ - (((u32)((value) & 0x0000FF00)) << 8) | \ - (((u32)((value) & 0x00FF0000)) >> 8) | \ - (((u32)((value) & 0xFF000000)) >> 24)) - enum { ENDIANNESS_MIN = 0, ENDIANNESS_UNKNOWN, @@ -37,7 +27,6 @@ enum { struct gdm_endian { u8 dev_ed; - u8 host_ed; }; void gdm_set_endian(struct gdm_endian *ed, u8 dev_endian); diff --git a/kernel/drivers/staging/gdm724x/gdm_lte.c b/kernel/drivers/staging/gdm724x/gdm_lte.c index a8d2cffb4..79de67880 100644 --- a/kernel/drivers/staging/gdm724x/gdm_lte.c +++ b/kernel/drivers/staging/gdm724x/gdm_lte.c @@ -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); 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, - sizeof(struct arphdr)); + sizeof(struct arphdr)); 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->dev = skb_in->dev; @@ -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.saddr.in6_u.u6_addr8, &na.target_address, 16); 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) + sizeof(struct neighbour_advertisement)); memcpy(icmp_na, &icmp6_out, sizeof(struct icmp6hdr)); memcpy(icmp_na + sizeof(struct icmp6hdr), &na, - sizeof(struct neighbour_advertisement)); + sizeof(struct neighbour_advertisement)); icmp6_out.icmp6_cksum = icmp6_checksum(&ipv6_out, (u16 *)icmp_na, sizeof(icmp_na)); @@ -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); 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, - sizeof(struct ipv6hdr)); + sizeof(struct ipv6hdr)); 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, - sizeof(struct neighbour_advertisement)); + sizeof(struct neighbour_advertisement)); skb_out->protocol = ((struct ethhdr *)mac_header_data)->h_proto; skb_out->dev = skb_in->dev; @@ -377,11 +377,11 @@ static s32 gdm_lte_tx_nic_type(struct net_device *dev, struct sk_buff *skb) break; case ETH_P_IP: nic_type |= NIC_TYPE_F_IPV4; - ip = (struct iphdr *)network_data; + ip = network_data; /* Check DHCPv4 */ if (ip->protocol == IPPROTO_UDP) { - struct udphdr *udp = (struct udphdr *) + struct udphdr *udp = (network_data + sizeof(struct iphdr)); if (ntohs(udp->dest) == 67 || ntohs(udp->dest) == 68) nic_type |= NIC_TYPE_F_DHCP; @@ -389,15 +389,15 @@ static s32 gdm_lte_tx_nic_type(struct net_device *dev, struct sk_buff *skb) break; case ETH_P_IPV6: nic_type |= NIC_TYPE_F_IPV6; - ipv6 = (struct ipv6hdr *)network_data; + ipv6 = network_data; if (ipv6->nexthdr == IPPROTO_ICMPV6) /* Check NDP request */ { - struct icmp6hdr *icmp6 = (struct icmp6hdr *) + struct icmp6hdr *icmp6 = (network_data + sizeof(struct ipv6hdr)); if (icmp6->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION) nic_type |= NIC_TYPE_ICMPV6; } else if (ipv6->nexthdr == IPPROTO_UDP) /* Check DHCPv6 */ { - struct udphdr *udp = (struct udphdr *) + struct udphdr *udp = (network_data + sizeof(struct ipv6hdr)); if (ntohs(udp->dest) == 546 || ntohs(udp->dest) == 547) nic_type |= NIC_TYPE_F_DHCP; @@ -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, - void *msg, int len) + void *msg, int len) { struct nic *nic = netdev_priv(dev); @@ -572,7 +572,7 @@ static u8 find_dev_index(u32 nic_type) } 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; struct nic *nic; @@ -697,9 +697,9 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len) u8 index; 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), - multi_sdu->num_packet); + multi_sdu->num_packet); for (i = 0; i < num_packet; i++) { sdu = (struct sdu *)data; @@ -724,12 +724,12 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len) if (index < MAX_NIC_TYPE) { dev = phy_dev->dev[index]; gdm_lte_netif_rx(dev, (char *)sdu->data, - (int)(hci_len-12), nic_type); + (int)(hci_len - 12), nic_type); } else { pr_err("rx sdu invalid nic_type :%x\n", nic_type); } - data += ((hci_len+3) & 0xfffc) + HCI_HEADER_SIZE; + data += ((hci_len + 3) & 0xfffc) + HCI_HEADER_SIZE; } } @@ -772,10 +772,10 @@ static int gdm_lte_receive_pkt(struct phy_dev *phy_dev, char *buf, int len) return ret; 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]; - if (dev == NULL) + if (!dev) return 0; switch (cmd_evt) { @@ -814,9 +814,9 @@ static int gdm_lte_receive_pkt(struct phy_dev *phy_dev, char *buf, int len) static int rx_complete(void *arg, void *data, int len, int context) { - struct phy_dev *phy_dev = (struct phy_dev *)arg; + struct phy_dev *phy_dev = arg; - return gdm_lte_receive_pkt(phy_dev, (char *)data, len); + return gdm_lte_receive_pkt(phy_dev, data, len); } void start_rx_proc(struct phy_dev *phy_dev) @@ -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 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 */ if (!mac_address) @@ -850,7 +850,7 @@ static void form_mac_address(u8 *dev_addr, u8 *nic_src, u8 *nic_dest, /* The last byte of the mac address * should be less than or equal to 0xFC */ - dev_addr[ETH_ALEN-1] += index; + dev_addr[ETH_ALEN - 1] += index; /* Create random nic src and copy the first * 3 bytes to be the same as dev_addr @@ -938,7 +938,7 @@ void unregister_lte_device(struct phy_dev *phy_dev) for (index = 0; index < MAX_NIC_TYPE; index++) { net = phy_dev->dev[index]; - if (net == NULL) + if (!net) continue; unregister_netdev(net); diff --git a/kernel/drivers/staging/gdm724x/gdm_mux.c b/kernel/drivers/staging/gdm724x/gdm_mux.c index 1cf24e4ed..445f83615 100644 --- a/kernel/drivers/staging/gdm724x/gdm_mux.c +++ b/kernel/drivers/staging/gdm724x/gdm_mux.c @@ -48,7 +48,6 @@ static const struct usb_device_id id_table[] = { {} }; - MODULE_DEVICE_TABLE(usb, id_table); static int packet_type_to_index(u16 packetType) @@ -67,7 +66,7 @@ static struct mux_tx *alloc_mux_tx(int len) { struct mux_tx *t = NULL; - t = kzalloc(sizeof(struct mux_tx), GFP_ATOMIC); + t = kzalloc(sizeof(*t), GFP_ATOMIC); if (!t) return NULL; @@ -96,7 +95,7 @@ static struct mux_rx *alloc_mux_rx(void) { struct mux_rx *r = NULL; - r = kzalloc(sizeof(struct mux_rx), GFP_KERNEL); + r = kzalloc(sizeof(*r), GFP_KERNEL); if (!r) return NULL; @@ -150,10 +149,9 @@ static void put_rx_struct(struct rx_cxt *rx, struct mux_rx *r) spin_unlock_irqrestore(&rx->free_list_lock, flags); } - static int up_to_host(struct mux_rx *r) { - struct mux_dev *mux_dev = (struct mux_dev *)r->mux_dev; + struct mux_dev *mux_dev = r->mux_dev; struct mux_pkt_header *mux_header; unsigned int start_flag; unsigned int payload_size; @@ -222,7 +220,7 @@ static void do_rx(struct work_struct *work) struct mux_dev *mux_dev = container_of(work, struct mux_dev, work_rx.work); struct mux_rx *r; - struct rx_cxt *rx = (struct rx_cxt *)&mux_dev->rx; + struct rx_cxt *rx = &mux_dev->rx; unsigned long flags; int ret = 0; @@ -262,7 +260,7 @@ static void remove_rx_submit_list(struct mux_rx *r, struct rx_cxt *rx) static void gdm_mux_rcv_complete(struct urb *urb) { struct mux_rx *r = urb->context; - struct mux_dev *mux_dev = (struct mux_dev *)r->mux_dev; + struct mux_dev *mux_dev = r->mux_dev; struct rx_cxt *rx = &mux_dev->rx; unsigned long flags; @@ -271,7 +269,7 @@ static void gdm_mux_rcv_complete(struct urb *urb) if (urb->status) { if (mux_dev->usb_state == PM_NORMAL) dev_err(&urb->dev->dev, "%s: urb status error %d\n", - __func__, urb->status); + __func__, urb->status); put_rx_struct(rx, r); } else { r->len = r->urb->actual_length; @@ -388,8 +386,8 @@ static int gdm_mux_send(void *priv_dev, void *data, int len, int tty_index, mux_header->payload_size = __cpu_to_le32((u32)len); mux_header->packet_type = __cpu_to_le16(packet_type[tty_index]); - memcpy(t->buf+MUX_HEADER_SIZE, data, len); - memset(t->buf+MUX_HEADER_SIZE+len, 0, total_len - MUX_HEADER_SIZE - + memcpy(t->buf + MUX_HEADER_SIZE, data, len); + memset(t->buf + MUX_HEADER_SIZE + len, 0, total_len - MUX_HEADER_SIZE - len); t->len = total_len; @@ -474,7 +472,6 @@ static void release_usb(struct mux_dev *mux_dev) spin_unlock_irqrestore(&rx->to_host_lock, flags); } - static int init_usb(struct mux_dev *mux_dev) { struct mux_rx *r; @@ -492,7 +489,7 @@ static int init_usb(struct mux_dev *mux_dev) for (i = 0; i < MAX_ISSUE_NUM * 2; i++) { r = alloc_mux_rx(); - if (r == NULL) { + if (!r) { ret = -ENOMEM; break; } @@ -526,11 +523,11 @@ static int gdm_mux_probe(struct usb_interface *intf, if (bInterfaceNumber != 2) return -ENODEV; - mux_dev = kzalloc(sizeof(struct mux_dev), GFP_KERNEL); + mux_dev = kzalloc(sizeof(*mux_dev), GFP_KERNEL); if (!mux_dev) return -ENOMEM; - tty_dev = kzalloc(sizeof(struct tty_dev), GFP_KERNEL); + tty_dev = kzalloc(sizeof(*tty_dev), GFP_KERNEL); if (!tty_dev) { ret = -ENOMEM; goto err_free_mux; @@ -612,7 +609,6 @@ static int gdm_mux_suspend(struct usb_interface *intf, pm_message_t pm_msg) mux_dev->usb_state = PM_SUSPEND; - spin_lock_irqsave(&rx->submit_list_lock, flags); list_for_each_entry_safe(r, r_next, &rx->rx_submit_list, rx_submit_list) { @@ -662,7 +658,7 @@ static int __init gdm_usb_mux_init(void) { mux_rx_wq = create_workqueue("mux_rx_wq"); - if (mux_rx_wq == NULL) { + if (!mux_rx_wq) { pr_err("work queue create fail\n"); return -1; } diff --git a/kernel/drivers/staging/gdm724x/gdm_tty.c b/kernel/drivers/staging/gdm724x/gdm_tty.c index 001348cca..e2c0f228f 100644 --- a/kernel/drivers/staging/gdm724x/gdm_tty.c +++ b/kernel/drivers/staging/gdm724x/gdm_tty.c @@ -88,7 +88,7 @@ static int gdm_tty_install(struct tty_driver *driver, struct tty_struct *tty) mutex_lock(&gdm_table_lock); gdm = gdm_table[i][j]; - if (gdm == NULL) { + if (!gdm) { mutex_unlock(&gdm_table_lock); return -ENODEV; } @@ -167,7 +167,7 @@ static int gdm_tty_recv_complete(void *data, static void gdm_tty_send_complete(void *arg) { - struct gdm *gdm = (struct gdm *)arg; + struct gdm *gdm = arg; if (!GDM_TTY_READY(gdm)) return; @@ -193,7 +193,7 @@ static int gdm_tty_write(struct tty_struct *tty, const unsigned char *buf, sending_len = remain > MUX_TX_MAX_SIZE ? MUX_TX_MAX_SIZE : remain; gdm_tty_send(gdm, - (void *)(buf+sent_len), + (void *)(buf + sent_len), sending_len, gdm->index, gdm_tty_send_complete, @@ -226,7 +226,7 @@ int register_lte_tty_device(struct tty_dev *tty_dev, struct device *device) for (i = 0; i < TTY_MAX_COUNT; i++) { - gdm = kmalloc(sizeof(struct gdm), GFP_KERNEL); + gdm = kmalloc(sizeof(*gdm), GFP_KERNEL); if (!gdm) return -ENOMEM; diff --git a/kernel/drivers/staging/gdm724x/gdm_usb.c b/kernel/drivers/staging/gdm724x/gdm_usb.c index ed1a12f50..92ea1a16a 100644 --- a/kernel/drivers/staging/gdm724x/gdm_usb.c +++ b/kernel/drivers/staging/gdm724x/gdm_usb.c @@ -63,7 +63,7 @@ static void do_rx(struct work_struct *work); static int gdm_usb_recv(void *priv_dev, int (*cb)(void *cb_data, - void *data, int len, int context), + void *data, int len, int context), void *cb_data, int context); @@ -80,7 +80,7 @@ static int request_mac_address(struct lte_udev *udev) hci->data[0] = MAC_ADDRESS; ret = usb_bulk_msg(usbdev, usb_sndbulkpipe(usbdev, 2), buf, 5, - &actual, 1000); + &actual, 1000); udev->request_mac_addr = 1; @@ -92,7 +92,7 @@ static struct usb_tx *alloc_tx_struct(int len) struct usb_tx *t = NULL; int ret = 0; - t = kzalloc(sizeof(struct usb_tx), GFP_ATOMIC); + t = kzalloc(sizeof(*t), GFP_ATOMIC); if (!t) { ret = -ENOMEM; goto out; @@ -125,7 +125,7 @@ static struct usb_tx_sdu *alloc_tx_sdu_struct(void) { struct usb_tx_sdu *t_sdu; - t_sdu = kzalloc(sizeof(struct usb_tx_sdu), GFP_KERNEL); + t_sdu = kzalloc(sizeof(*t_sdu), GFP_KERNEL); if (!t_sdu) return NULL; @@ -183,7 +183,7 @@ static struct usb_rx *alloc_rx_struct(void) struct usb_rx *r = NULL; int ret = 0; - r = kmalloc(sizeof(struct usb_rx), GFP_KERNEL); + r = kmalloc(sizeof(*r), GFP_KERNEL); if (!r) { ret = -ENOMEM; goto out; @@ -338,7 +338,7 @@ static int init_usb(struct lte_udev *udev) for (i = 0; i < MAX_NUM_SDU_BUF; i++) { t_sdu = alloc_tx_sdu_struct(); - if (t_sdu == NULL) { + if (!t_sdu) { ret = -ENOMEM; goto fail; } @@ -347,9 +347,9 @@ static int init_usb(struct lte_udev *udev) tx->avail_count++; } - for (i = 0; i < MAX_RX_SUBMIT_COUNT*2; i++) { + for (i = 0; i < MAX_RX_SUBMIT_COUNT * 2; i++) { r = alloc_rx_struct(); - if (r == NULL) { + if (!r) { ret = -ENOMEM; goto fail; } @@ -367,7 +367,7 @@ fail: static int set_mac_address(u8 *data, void *arg) { - struct phy_dev *phy_dev = (struct phy_dev *)arg; + struct phy_dev *phy_dev = arg; struct lte_udev *udev = phy_dev->priv_dev; struct tlv *tlv = (struct tlv *)data; u8 mac_address[ETH_ALEN] = {0, }; @@ -376,7 +376,7 @@ static int set_mac_address(u8 *data, void *arg) memcpy(mac_address, tlv->data, tlv->len); 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"); udev->request_mac_addr = 0; @@ -406,12 +406,12 @@ static void do_rx(struct work_struct *work) break; } 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); spin_unlock_irqrestore(&rx->to_host_lock, flags); - phy_dev = (struct phy_dev *)r->cb_data; - udev = (struct lte_udev *)phy_dev->priv_dev; + phy_dev = r->cb_data; + udev = phy_dev->priv_dev; hci = (struct hci_packet *)r->buf; cmd_evt = gdm_dev16_to_cpu(&udev->gdm_ed, hci->cmd_evt); @@ -481,7 +481,7 @@ static void gdm_usb_rcv_complete(struct urb *urb) } else { if (urb->status && udev->usb_state == PM_NORMAL) dev_err(&urb->dev->dev, "%s: urb status error %d\n", - __func__, urb->status); + __func__, urb->status); put_rx_struct(rx, r); } @@ -491,7 +491,7 @@ static void gdm_usb_rcv_complete(struct urb *urb) static int gdm_usb_recv(void *priv_dev, int (*cb)(void *cb_data, - void *data, int len, int context), + void *data, int len, int context), void *cb_data, int context) { @@ -576,7 +576,7 @@ static int send_tx_packet(struct usb_device *usbdev, struct usb_tx *t, u32 len) { int ret = 0; - if (!(len%512)) + if (!(len % 512)) len++; usb_fill_bulk_urb(t->urb, @@ -682,7 +682,7 @@ static void do_tx(struct work_struct *work) } t = alloc_tx_struct(TX_BUF_SIZE); - if (t == NULL) { + if (!t) { spin_unlock_irqrestore(&tx->lock, flags); return; } @@ -711,8 +711,8 @@ static void do_tx(struct work_struct *work) #define SDU_PARAM_LEN 12 static int gdm_usb_sdu_send(void *priv_dev, void *data, int len, - unsigned int dftEpsId, unsigned int epsId, - void (*cb)(void *data), void *cb_data, + unsigned int dftEpsId, unsigned int epsId, + void (*cb)(void *data), void *cb_data, int dev_idx, int nic_type) { struct lte_udev *udev = priv_dev; @@ -732,7 +732,7 @@ static int gdm_usb_sdu_send(void *priv_dev, void *data, int len, t_sdu = get_tx_sdu_struct(tx, &no_spc); spin_unlock_irqrestore(&tx->lock, flags); - if (t_sdu == NULL) { + if (!t_sdu) { pr_err("sdu send - free list empty\n"); return TX_NO_SPC; } @@ -745,7 +745,7 @@ static int gdm_usb_sdu_send(void *priv_dev, void *data, int len, } else { send_len = len - ETH_HLEN; send_len += SDU_PARAM_LEN; - memcpy(sdu->data, data+ETH_HLEN, len-ETH_HLEN); + memcpy(sdu->data, data + ETH_HLEN, len - ETH_HLEN); } sdu->len = gdm_cpu_to_dev16(&udev->gdm_ed, send_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, - void (*cb)(void *data), void *cb_data) + void (*cb)(void *data), void *cb_data) { struct lte_udev *udev = priv_dev; struct tx_cxt *tx = &udev->tx; @@ -782,7 +782,7 @@ static int gdm_usb_hci_send(void *priv_dev, void *data, int len, } t = alloc_tx_struct(len); - if (t == NULL) { + if (!t) { pr_err("hci_send - out of memory\n"); return -ENOMEM; } @@ -810,7 +810,7 @@ static struct gdm_endian *gdm_usb_get_endian(void *priv_dev) } static int gdm_usb_probe(struct usb_interface *intf, - const struct usb_device_id *id) + const struct usb_device_id *id) { int ret = 0; struct phy_dev *phy_dev = NULL; @@ -830,11 +830,11 @@ static int gdm_usb_probe(struct usb_interface *intf, return -ENODEV; } - phy_dev = kzalloc(sizeof(struct phy_dev), GFP_KERNEL); + phy_dev = kzalloc(sizeof(*phy_dev), GFP_KERNEL); if (!phy_dev) return -ENOMEM; - udev = kzalloc(sizeof(struct lte_udev), GFP_KERNEL); + udev = kzalloc(sizeof(*udev), GFP_KERNEL); if (!udev) { ret = -ENOMEM; goto err_udev; @@ -1006,11 +1006,11 @@ static int __init gdm_usb_lte_init(void) } usb_tx_wq = create_workqueue("usb_tx_wq"); - if (usb_tx_wq == NULL) + if (!usb_tx_wq) return -1; usb_rx_wq = create_workqueue("usb_rx_wq"); - if (usb_rx_wq == NULL) + if (!usb_rx_wq) return -1; return usb_register(&gdm_usb_lte_driver); diff --git a/kernel/drivers/staging/gdm724x/netlink_k.c b/kernel/drivers/staging/gdm724x/netlink_k.c index 59a18304e..92254fdaa 100644 --- a/kernel/drivers/staging/gdm724x/netlink_k.c +++ b/kernel/drivers/staging/gdm724x/netlink_k.c @@ -34,8 +34,8 @@ static struct semaphore netlink_mutex; #define ND_NLMSG_SPACE(len) (NLMSG_SPACE(len) + ND_IFINDEX_LEN) #define ND_NLMSG_DATA(nlh) ((void *)((char *)NLMSG_DATA(nlh) + \ ND_IFINDEX_LEN)) -#define ND_NLMSG_S_LEN(len) (len+ND_IFINDEX_LEN) -#define ND_NLMSG_R_LEN(nlh) (nlh->nlmsg_len-ND_IFINDEX_LEN) +#define ND_NLMSG_S_LEN(len) (len + ND_IFINDEX_LEN) +#define ND_NLMSG_R_LEN(nlh) (nlh->nlmsg_len - ND_IFINDEX_LEN) #define ND_NLMSG_IFIDX(nlh) NLMSG_DATA(nlh) #define ND_MAX_MSG_LEN (1024 * 32) @@ -122,7 +122,7 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) if (group > ND_MAX_GROUP) return -EINVAL; - if (!netlink_has_listeners(sock, group+1)) + if (!netlink_has_listeners(sock, group + 1)) return -ESRCH; skb = alloc_skb(NLMSG_SPACE(len), GFP_ATOMIC); @@ -136,14 +136,14 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) NETLINK_CB(skb).portid = 0; NETLINK_CB(skb).dst_group = 0; - ret = netlink_broadcast(sock, skb, 0, group+1, GFP_ATOMIC); + ret = netlink_broadcast(sock, skb, 0, group + 1, GFP_ATOMIC); if (!ret) return len; if (ret != -ESRCH) pr_err("nl broadcast g=%d, t=%d, l=%d, r=%d\n", group, type, len, ret); - else if (netlink_has_listeners(sock, group+1)) + else if (netlink_has_listeners(sock, group + 1)) return -EAGAIN; return ret; -- cgit 1.2.3-korg