diff options
author | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
---|---|---|
committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/gdm72xx | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
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.
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 <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/gdm72xx')
-rw-r--r-- | kernel/drivers/staging/gdm72xx/gdm_qos.c | 4 | ||||
-rw-r--r-- | kernel/drivers/staging/gdm72xx/gdm_sdio.c | 20 | ||||
-rw-r--r-- | kernel/drivers/staging/gdm72xx/gdm_usb.c | 16 | ||||
-rw-r--r-- | kernel/drivers/staging/gdm72xx/gdm_wimax.c | 24 | ||||
-rw-r--r-- | kernel/drivers/staging/gdm72xx/netlink_k.c | 2 | ||||
-rw-r--r-- | kernel/drivers/staging/gdm72xx/sdio_boot.c | 4 | ||||
-rw-r--r-- | kernel/drivers/staging/gdm72xx/usb_boot.c | 8 | ||||
-rw-r--r-- | kernel/drivers/staging/gdm72xx/usb_ids.h | 6 |
8 files changed, 46 insertions, 38 deletions
diff --git a/kernel/drivers/staging/gdm72xx/gdm_qos.c b/kernel/drivers/staging/gdm72xx/gdm_qos.c index 96bf2bf87..81feffa57 100644 --- a/kernel/drivers/staging/gdm72xx/gdm_qos.c +++ b/kernel/drivers/staging/gdm72xx/gdm_qos.c @@ -59,7 +59,7 @@ static void *alloc_qos_entry(void) static void free_qos_entry(void *entry) { - struct qos_entry_s *qentry = (struct qos_entry_s *)entry; + struct qos_entry_s *qentry = entry; unsigned long flags; spin_lock_irqsave(&qos_free_list.lock, flags); @@ -190,7 +190,7 @@ static int get_qos_index(struct nic *nic, u8 *iph, u8 *tcpudph) int ip_ver, i; struct qos_cb_s *qcb = &nic->qos; - if (iph == NULL || tcpudph == NULL) + if (!iph || !tcpudph) return -1; ip_ver = (iph[0]>>4)&0xf; diff --git a/kernel/drivers/staging/gdm72xx/gdm_sdio.c b/kernel/drivers/staging/gdm72xx/gdm_sdio.c index a5fd07948..b0521da3c 100644 --- a/kernel/drivers/staging/gdm72xx/gdm_sdio.c +++ b/kernel/drivers/staging/gdm72xx/gdm_sdio.c @@ -173,12 +173,12 @@ static int init_sdio(struct sdiowm_dev *sdev) spin_lock_init(&tx->lock); tx->sdu_buf = kmalloc(SDU_TX_BUF_SIZE, GFP_KERNEL); - if (tx->sdu_buf == NULL) + if (!tx->sdu_buf) goto fail; for (i = 0; i < MAX_NR_SDU_BUF; i++) { t = alloc_tx_struct(tx); - if (t == NULL) { + if (!t) { ret = -ENOMEM; goto fail; } @@ -192,7 +192,7 @@ static int init_sdio(struct sdiowm_dev *sdev) for (i = 0; i < MAX_NR_RX_BUF; i++) { r = alloc_rx_struct(rx); - if (r == NULL) { + if (!r) { ret = -ENOMEM; goto fail; } @@ -200,7 +200,7 @@ static int init_sdio(struct sdiowm_dev *sdev) } rx->rx_buf = kmalloc(RX_BUF_SIZE, GFP_KERNEL); - if (rx->rx_buf == NULL) + if (!rx->rx_buf) goto fail; return 0; @@ -359,7 +359,7 @@ static void do_tx(struct work_struct *work) is_sdu = 1; } - if (!is_sdu && t == NULL) { + if (!is_sdu && !t) { spin_unlock_irqrestore(&tx->lock, flags); return; } @@ -393,7 +393,7 @@ static int gdm_sdio_send(void *priv_dev, void *data, int len, cmd_evt = (pkt[0] << 8) | pkt[1]; if (cmd_evt == WIMAX_TX_SDU) { t = get_tx_struct(tx, &no_spc); - if (t == NULL) { + if (!t) { /* This case must not happen. */ spin_unlock_irqrestore(&tx->lock, flags); return -ENOSPC; @@ -407,7 +407,7 @@ static int gdm_sdio_send(void *priv_dev, void *data, int len, t->cb_data = cb_data; } else { t = alloc_tx_struct(tx); - if (t == NULL) { + if (!t) { spin_unlock_irqrestore(&tx->lock, flags); return -ENOMEM; } @@ -581,7 +581,7 @@ static int gdm_sdio_receive(void *priv_dev, spin_lock_irqsave(&rx->lock, flags); r = get_rx_struct(rx); - if (r == NULL) { + if (!r) { spin_unlock_irqrestore(&rx->lock, flags); return -ENOMEM; } @@ -615,12 +615,12 @@ static int sdio_wimax_probe(struct sdio_func *func, return ret; phy_dev = kzalloc(sizeof(*phy_dev), GFP_KERNEL); - if (phy_dev == NULL) { + if (!phy_dev) { ret = -ENOMEM; goto out; } sdev = kzalloc(sizeof(*sdev), GFP_KERNEL); - if (sdev == NULL) { + if (!sdev) { ret = -ENOMEM; goto out; } diff --git a/kernel/drivers/staging/gdm72xx/gdm_usb.c b/kernel/drivers/staging/gdm72xx/gdm_usb.c index eac2f3478..16e497d9d 100644 --- a/kernel/drivers/staging/gdm72xx/gdm_usb.c +++ b/kernel/drivers/staging/gdm72xx/gdm_usb.c @@ -139,7 +139,7 @@ static struct usb_rx *get_rx_struct(struct rx_cxt *rx) if (list_empty(&rx->free_list)) { r = alloc_rx_struct(rx); - if (r == NULL) + if (!r) return NULL; list_add(&r->list, &rx->free_list); @@ -224,7 +224,7 @@ static int init_usb(struct usbwm_dev *udev) spin_lock_irqsave(&tx->lock, flags); for (i = 0; i < MAX_NR_SDU_BUF; i++) { t = alloc_tx_struct(tx); - if (t == NULL) { + if (!t) { spin_unlock_irqrestore(&tx->lock, flags); ret = -ENOMEM; goto fail; @@ -234,7 +234,7 @@ static int init_usb(struct usbwm_dev *udev) spin_unlock_irqrestore(&tx->lock, flags); r = alloc_rx_struct(rx); - if (r == NULL) { + if (!r) { ret = -ENOMEM; goto fail; } @@ -313,7 +313,7 @@ static int gdm_usb_send(void *priv_dev, void *data, int len, cmd_evt = (pkt[0] << 8) | pkt[1]; if (cmd_evt == WIMAX_TX_SDU) { t = get_tx_struct(tx, &no_spc); - if (t == NULL) { + if (!t) { /* This case must not happen. */ spin_unlock_irqrestore(&tx->lock, flags); return -ENOSPC; @@ -321,7 +321,7 @@ static int gdm_usb_send(void *priv_dev, void *data, int len, list_add_tail(&t->list, &tx->sdu_list); } else { t = alloc_tx_struct(tx); - if (t == NULL) { + if (!t) { spin_unlock_irqrestore(&tx->lock, flags); return -ENOMEM; } @@ -478,7 +478,7 @@ static int gdm_usb_receive(void *priv_dev, r = get_rx_struct(rx); spin_unlock_irqrestore(&rx->lock, flags); - if (r == NULL) + if (!r) return -ENOMEM; r->callback = cb; @@ -558,12 +558,12 @@ static int gdm_usb_probe(struct usb_interface *intf, } phy_dev = kzalloc(sizeof(*phy_dev), GFP_KERNEL); - if (phy_dev == NULL) { + if (!phy_dev) { ret = -ENOMEM; goto out; } udev = kzalloc(sizeof(*udev), GFP_KERNEL); - if (udev == NULL) { + if (!udev) { ret = -ENOMEM; goto out; } diff --git a/kernel/drivers/staging/gdm72xx/gdm_wimax.c b/kernel/drivers/staging/gdm72xx/gdm_wimax.c index 61d168e82..d9ddced96 100644 --- a/kernel/drivers/staging/gdm72xx/gdm_wimax.c +++ b/kernel/drivers/staging/gdm72xx/gdm_wimax.c @@ -62,7 +62,7 @@ static inline int gdm_wimax_header(struct sk_buff **pskb) struct sk_buff *skb2; skb2 = skb_realloc_headroom(skb, HCI_HEADER_SIZE); - if (skb2 == NULL) + if (!skb2) return -ENOMEM; if (skb->sk) skb_set_owner_w(skb2, skb->sk); @@ -339,7 +339,7 @@ static void gdm_wimax_ind_if_updown(struct net_device *dev, int if_up) static int gdm_wimax_open(struct net_device *dev) { struct nic *nic = netdev_priv(dev); - struct fsm_s *fsm = (struct fsm_s *)nic->sdk_data[SIOC_DATA_FSM].buf; + struct fsm_s *fsm = nic->sdk_data[SIOC_DATA_FSM].buf; netif_start_queue(dev); @@ -351,7 +351,7 @@ static int gdm_wimax_open(struct net_device *dev) static int gdm_wimax_close(struct net_device *dev) { struct nic *nic = netdev_priv(dev); - struct fsm_s *fsm = (struct fsm_s *)nic->sdk_data[SIOC_DATA_FSM].buf; + struct fsm_s *fsm = nic->sdk_data[SIOC_DATA_FSM].buf; netif_stop_queue(dev); @@ -378,7 +378,7 @@ static int gdm_wimax_ioctl_get_data(struct data_s *dst, struct data_s *src) if (src->size) { if (!dst->buf) return -EINVAL; - if (copy_to_user((void __user *)dst->buf, src->buf, size)) + if (copy_to_user(dst->buf, src->buf, size)) return -EFAULT; } return 0; @@ -397,11 +397,11 @@ static int gdm_wimax_ioctl_set_data(struct data_s *dst, struct data_s *src) if (!(dst->buf && dst->size == src->size)) { kdelete(&dst->buf); dst->buf = kmalloc(src->size, GFP_KERNEL); - if (dst->buf == NULL) + if (!dst->buf) return -ENOMEM; } - if (copy_from_user(dst->buf, (void __user *)src->buf, src->size)) { + if (copy_from_user(dst->buf, src->buf, src->size)) { kdelete(&dst->buf); return -EFAULT; } @@ -435,7 +435,7 @@ static void gdm_wimax_ind_fsm_update(struct net_device *dev, struct fsm_s *fsm) static void gdm_update_fsm(struct net_device *dev, struct fsm_s *new_fsm) { struct nic *nic = netdev_priv(dev); - struct fsm_s *cur_fsm = (struct fsm_s *) + struct fsm_s *cur_fsm = nic->sdk_data[SIOC_DATA_FSM].buf; if (!cur_fsm) @@ -483,7 +483,7 @@ static int gdm_wimax_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) * before gdm_wimax_ioctl_set_data is called. */ gdm_update_fsm(dev, - (struct fsm_s *)req->data.buf); + req->data.buf); } ret = gdm_wimax_ioctl_set_data( &nic->sdk_data[req->data_id], &req->data); @@ -581,10 +581,10 @@ static int gdm_wimax_get_prepared_info(struct net_device *dev, char *buf, } pos += gdm_wimax_hci_get_tlv(&buf[pos], &T, &L, &V); - if (T == TLV_T(T_MAC_ADDRESS)) { - if (L != dev->addr_len) { + if (TLV_T(T_MAC_ADDRESS) == T) { + if (dev->addr_len != L) { netdev_err(dev, - "%s Invalid inofrmation result T/L [%x/%d]\n", + "%s Invalid information result T/L [%x/%d]\n", __func__, T, L); return -1; } @@ -798,7 +798,7 @@ cleanup: void unregister_wimax_device(struct phy_dev *phy_dev) { struct nic *nic = netdev_priv(phy_dev->netdev); - struct fsm_s *fsm = (struct fsm_s *)nic->sdk_data[SIOC_DATA_FSM].buf; + struct fsm_s *fsm = nic->sdk_data[SIOC_DATA_FSM].buf; if (fsm) fsm->m_status = M_INIT; diff --git a/kernel/drivers/staging/gdm72xx/netlink_k.c b/kernel/drivers/staging/gdm72xx/netlink_k.c index 9d78bfcdb..f3cdaa6c4 100644 --- a/kernel/drivers/staging/gdm72xx/netlink_k.c +++ b/kernel/drivers/staging/gdm72xx/netlink_k.c @@ -121,7 +121,7 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) int ret = 0; if (group > ND_MAX_GROUP) { - pr_err("Group %d is invalied.\n", group); + pr_err("Group %d is invalid.\n", group); pr_err("Valid group is 0 ~ %d.\n", ND_MAX_GROUP); return -EINVAL; } diff --git a/kernel/drivers/staging/gdm72xx/sdio_boot.c b/kernel/drivers/staging/gdm72xx/sdio_boot.c index 2c02842ac..ba94b5f13 100644 --- a/kernel/drivers/staging/gdm72xx/sdio_boot.c +++ b/kernel/drivers/staging/gdm72xx/sdio_boot.c @@ -72,7 +72,7 @@ static int download_image(struct sdio_func *func, const char *img_name) } buf = kmalloc(DOWNLOAD_SIZE + TYPE_A_HEADER_SIZE, GFP_KERNEL); - if (buf == NULL) + if (!buf) return -ENOMEM; img_len = firm->size; @@ -139,7 +139,7 @@ int sdio_boot(struct sdio_func *func) const char *rfs_name = FW_DIR FW_RFS; tx_buf = kmalloc(YMEM0_SIZE, GFP_KERNEL); - if (tx_buf == NULL) + if (!tx_buf) return -ENOMEM; ret = download_image(func, krn_name); diff --git a/kernel/drivers/staging/gdm72xx/usb_boot.c b/kernel/drivers/staging/gdm72xx/usb_boot.c index 3ccc44773..39ca34031 100644 --- a/kernel/drivers/staging/gdm72xx/usb_boot.c +++ b/kernel/drivers/staging/gdm72xx/usb_boot.c @@ -159,8 +159,10 @@ int usb_boot(struct usb_device *usbdev, u16 pid) } tx_buf = kmalloc(DOWNLOAD_SIZE, GFP_KERNEL); - if (tx_buf == NULL) + if (!tx_buf) { + release_firmware(firm); return -ENOMEM; + } if (firm->size < sizeof(hdr)) { dev_err(&usbdev->dev, "Cannot read the image info.\n"); @@ -285,8 +287,10 @@ static int em_download_image(struct usb_device *usbdev, const char *img_name, } buf = kmalloc(DOWNLOAD_CHUCK + pad_size, GFP_KERNEL); - if (buf == NULL) + if (!buf) { + release_firmware(firm); return -ENOMEM; + } strcpy(buf+pad_size, type_string); ret = gdm_wibro_send(usbdev, buf, strlen(type_string)+pad_size); diff --git a/kernel/drivers/staging/gdm72xx/usb_ids.h b/kernel/drivers/staging/gdm72xx/usb_ids.h index 8ce544de7..7afb9ba5f 100644 --- a/kernel/drivers/staging/gdm72xx/usb_ids.h +++ b/kernel/drivers/staging/gdm72xx/usb_ids.h @@ -32,7 +32,9 @@ #define BL_PID_MASK 0xffc0 #define USB_DEVICE_BOOTLOADER(vid, pid) \ - {USB_DEVICE((vid), ((pid)&BL_PID_MASK)|B_DOWNLOAD)}, \ + {USB_DEVICE((vid), ((pid)&BL_PID_MASK)|B_DOWNLOAD)} + +#define USB_DEVICE_BOOTLOADER_DRV(vid, pid) \ {USB_DEVICE((vid), ((pid)&BL_PID_MASK)|B_DOWNLOAD|B_DIFF_DL_DRV)} #define USB_DEVICE_CDC_DATA(vid, pid) \ @@ -40,6 +42,7 @@ static const struct usb_device_id id_table[] = { USB_DEVICE_BOOTLOADER(GCT_VID, GCT_PID1), + USB_DEVICE_BOOTLOADER_DRV(GCT_VID, GCT_PID1), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID1), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID1+0x1), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID1+0x2), @@ -58,6 +61,7 @@ static const struct usb_device_id id_table[] = { USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID1+0xf), USB_DEVICE_BOOTLOADER(GCT_VID, GCT_PID2), + USB_DEVICE_BOOTLOADER_DRV(GCT_VID, GCT_PID2), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID2), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID2+0x1), USB_DEVICE_CDC_DATA(GCT_VID, GCT_PID2+0x2), |