diff options
Diffstat (limited to 'drivers/staging/gdm72xx')
-rw-r--r-- | drivers/staging/gdm72xx/gdm_qos.c | 12 | ||||
-rw-r--r-- | drivers/staging/gdm72xx/gdm_sdio.c | 4 | ||||
-rw-r--r-- | drivers/staging/gdm72xx/gdm_usb.c | 2 | ||||
-rw-r--r-- | drivers/staging/gdm72xx/gdm_wimax.c | 19 |
4 files changed, 19 insertions, 18 deletions
diff --git a/drivers/staging/gdm72xx/gdm_qos.c b/drivers/staging/gdm72xx/gdm_qos.c index 8c99f919cae1..9fc476f0ce88 100644 --- a/drivers/staging/gdm72xx/gdm_qos.c +++ b/drivers/staging/gdm72xx/gdm_qos.c @@ -261,7 +261,7 @@ int gdm_qos_send_hci_pkt(struct sk_buff *skb, struct net_device *dev) struct list_head send_list; int ret = 0; - tcph = (struct tcphdr *)iph + iph->ihl*4; + tcph = (struct tcphdr *)iph + iph->ihl * 4; if (ethh->h_proto == cpu_to_be16(ETH_P_IP)) { if (qcb->qos_list_cnt && !qos_free_list.cnt) { @@ -342,17 +342,17 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size) if (sub_cmd_evt == QOS_REPORT) { spin_lock_irqsave(&qcb->qos_lock, flags); for (i = 0; i < qcb->qos_list_cnt; i++) { - sfid = ((buf[(i*5) + 6] << 24) & 0xff000000); - sfid += ((buf[(i*5) + 7] << 16) & 0xff0000); - sfid += ((buf[(i*5) + 8] << 8) & 0xff00); - sfid += (buf[(i*5) + 9]); + sfid = ((buf[(i * 5) + 6] << 24) & 0xff000000); + sfid += ((buf[(i * 5) + 7] << 16) & 0xff0000); + sfid += ((buf[(i * 5) + 8] << 8) & 0xff00); + sfid += (buf[(i * 5) + 9]); index = get_csr(qcb, sfid, 0); if (index == -1) { spin_unlock_irqrestore(&qcb->qos_lock, flags); netdev_err(nic->netdev, "QoS ERROR: No SF\n"); return; } - qcb->csr[index].qos_buf_count = buf[(i*5) + 10]; + qcb->csr[index].qos_buf_count = buf[(i * 5) + 10]; } extract_qos_list(nic, &send_list); diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c index 1f5a087723ba..9449418dd8fe 100644 --- a/drivers/staging/gdm72xx/gdm_sdio.c +++ b/drivers/staging/gdm72xx/gdm_sdio.c @@ -33,10 +33,10 @@ #define SDU_TX_BUF_SIZE 2048 #define TX_BUF_SIZE 2048 #define TX_CHUNK_SIZE (2048 - TYPE_A_HEADER_SIZE) -#define RX_BUF_SIZE (25*1024) +#define RX_BUF_SIZE (25 * 1024) #define TX_HZ 2000 -#define TX_INTERVAL (NSEC_PER_SEC/TX_HZ) +#define TX_INTERVAL (NSEC_PER_SEC / TX_HZ) static struct sdio_tx *alloc_tx_struct(struct tx_cxt *tx) { diff --git a/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c index 7f035b12aafd..f81129d5f6ef 100644 --- a/drivers/staging/gdm72xx/gdm_usb.c +++ b/drivers/staging/gdm72xx/gdm_usb.c @@ -29,7 +29,7 @@ MODULE_DEVICE_TABLE(usb, id_table); #define TX_BUF_SIZE 2048 #if defined(CONFIG_WIMAX_GDM72XX_WIMAX2) -#define RX_BUF_SIZE (128*1024) /* For packet aggregation */ +#define RX_BUF_SIZE (128 * 1024) /* For packet aggregation */ #else #define RX_BUF_SIZE 2048 #endif diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c index 1b3da2ba6ed1..988d71a26c39 100644 --- a/drivers/staging/gdm72xx/gdm_wimax.c +++ b/drivers/staging/gdm72xx/gdm_wimax.c @@ -111,8 +111,8 @@ static void gdm_wimax_event_rcv(struct net_device *dev, u16 type, void *msg, struct nic *nic = netdev_priv(dev); u8 *buf = msg; - u16 hci_cmd = (buf[0]<<8) | buf[1]; - u16 hci_len = (buf[2]<<8) | buf[3]; + u16 hci_cmd = (buf[0] << 8) | buf[1]; + u16 hci_len = (buf[2] << 8) | buf[3]; netdev_dbg(dev, "H=>D: 0x%04x(%d)\n", hci_cmd, hci_len); @@ -193,8 +193,8 @@ static int gdm_wimax_event_send(struct net_device *dev, char *buf, int size) struct evt_entry *e; unsigned long flags; - u16 hci_cmd = ((u8)buf[0]<<8) | (u8)buf[1]; - u16 hci_len = ((u8)buf[2]<<8) | (u8)buf[3]; + u16 hci_cmd = ((u8)buf[0] << 8) | (u8)buf[1]; + u16 hci_len = ((u8)buf[2] << 8) | (u8)buf[3]; netdev_dbg(dev, "D=>H: 0x%04x(%d)\n", hci_cmd, hci_len); @@ -328,7 +328,8 @@ static void gdm_wimax_ind_if_updown(struct net_device *dev, int if_up) hci->length = cpu_to_be16(sizeof(up_down)); hci->data[0] = up_down; - gdm_wimax_event_send(dev, (char *)hci, HCI_HEADER_SIZE+sizeof(up_down)); + gdm_wimax_event_send(dev, (char *)hci, HCI_HEADER_SIZE + + sizeof(up_down)); } static int gdm_wimax_open(struct net_device *dev) @@ -512,7 +513,7 @@ static void gdm_wimax_prepare_device(struct net_device *dev) hci->cmd_evt = cpu_to_be16(WIMAX_GET_INFO); hci->data[len++] = TLV_T(T_MAC_ADDRESS); hci->length = cpu_to_be16(len); - gdm_wimax_send(nic, hci, HCI_HEADER_SIZE+len); + gdm_wimax_send(nic, hci, HCI_HEADER_SIZE + len); val = T_CAPABILITY_WIMAX | T_CAPABILITY_MULTI_CS; #if defined(CONFIG_WIMAX_GDM72XX_QOS) @@ -531,7 +532,7 @@ static void gdm_wimax_prepare_device(struct net_device *dev) memcpy(&hci->data[len], &val_be32, TLV_L(T_CAPABILITY)); len += TLV_L(T_CAPABILITY); hci->length = cpu_to_be16(len); - gdm_wimax_send(nic, hci, HCI_HEADER_SIZE+len); + gdm_wimax_send(nic, hci, HCI_HEADER_SIZE + len); netdev_info(dev, "GDM WiMax Set CAPABILITY: 0x%08X\n", val); } @@ -544,10 +545,10 @@ static int gdm_wimax_hci_get_tlv(u8 *buf, u8 *T, u16 *L, u8 **V) *T = buf[0]; if (buf[1] == 0x82) { *L = be16_to_cpu(__U82U16(&buf[2])); - next_pos = 1/*type*/+3/*len*/; + next_pos = 1/*type*/ + 3/*len*/; } else { *L = buf[1]; - next_pos = 1/*type*/+1/*len*/; + next_pos = 1/*type*/ + 1/*len*/; } *V = &buf[next_pos]; |