Commit 39c511f8 authored by Michalis Pappas's avatar Michalis Pappas Committed by Greg Kroah-Hartman
Browse files

staging: gdm72xx: Whitespace fixes to conform to coding standards 



Fixes the following checkpatch.pl issues:

WARNING: unnecessary whitespace before a quoted newline
CHECK: Alignment should match open parenthesis
CHECK: No space is necessary after a cast

Also some additional, whitespace related, readability issues.

Signed-off-by: default avatarMichalis Pappas <mpappas@fastmail.fm>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b268666f

drivers/staging/gdm72xx/gdm_qos.c

+34 −38
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ static void *alloc_qos_entry(void) 


	spin_lock_irqsave(&qos_free_list.lock, flags);

	if (qos_free_list.cnt) {

		entry = list_entry(qos_free_list.head.prev, struct qos_entry_s,

					list);

		entry = list_entry(qos_free_list.head.prev, struct qos_entry_s, list);

		list_del(&entry->list);

		qos_free_list.cnt--;

		spin_unlock_irqrestore(&qos_free_list.lock, flags);
@@ -198,17 +197,17 @@ static u32 get_qos_index(struct nic *nic, u8 *iph, u8 *tcpudph) 


	IP_ver = (iph[0]>>4)&0xf;



	if (IP_ver == 4) {

	if (IP_ver != 4)

		return -1;



	for (i = 0; i < QOS_MAX; i++) {

			if (qcb->csr[i].enabled) {

				if (qcb->csr[i].classifier_rule_en) {

					if (chk_ipv4_rule(&qcb->csr[i], iph,

					tcpudph) == 0)

		if (!qcb->csr[i].enabled)

			continue;

		if (!qcb->csr[i].classifier_rule_en)

			continue;

		if (chk_ipv4_rule(&qcb->csr[i], iph, tcpudph) == 0)

			return i;

	}

			}

		}

	}



	return -1;

}
@@ -222,22 +221,20 @@ static u32 extract_qos_list(struct nic *nic, struct list_head *head) 
	INIT_LIST_HEAD(head);



	for (i = 0; i < QOS_MAX; i++) {

		if (qcb->csr[i].enabled) {

			if (qcb->csr[i].qos_buf_count < qcb->qos_limit_size) {

				if (!list_empty(&qcb->qos_list[i])) {

					entry = list_entry(

					qcb->qos_list[i].prev,

					struct qos_entry_s, list);

		if (!qcb->csr[i].enabled)

			continue;

		if (qcb->csr[i].qos_buf_count >= qcb->qos_limit_size)

			continue;

		if (list_empty(&qcb->qos_list[i]))

			continue;



		entry = list_entry(qcb->qos_list[i].prev, struct qos_entry_s, list);



		list_move_tail(&entry->list, head);

		qcb->csr[i].qos_buf_count++;



		if (!list_empty(&qcb->qos_list[i]))

						netdev_warn(nic->netdev,

							    "Index(%d) is piled!!\n",

							    i);

				}

			}

		}

			netdev_warn(nic->netdev, "Index(%d) is piled!!\n", i);

	}



	return 0;
@@ -433,8 +430,7 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size) 
		qcb->qos_list_cnt--;

		qcb->qos_limit_size = 254/qcb->qos_list_cnt;



		list_for_each_entry_safe(entry, n, &qcb->qos_list[index],

					list) {

		list_for_each_entry_safe(entry, n, &qcb->qos_list[index], list) {

			list_move_tail(&entry->list, &free_list);

		}

		spin_unlock_irqrestore(&qcb->qos_lock, flags);

drivers/staging/gdm72xx/gdm_sdio.c

+7 −8
Original line number Diff line number Diff line
@@ -312,8 +312,7 @@ static void send_sdu(struct sdio_func *func, struct tx_cxt *tx) 
	spin_unlock_irqrestore(&tx->lock, flags);

}



static void send_hci(struct sdio_func *func, struct tx_cxt *tx,

			struct sdio_tx *t)

static void send_hci(struct sdio_func *func, struct tx_cxt *tx, struct sdio_tx *t)

{

	unsigned long flags;
@@ -510,6 +509,7 @@ static void gdm_sdio_irq(struct sdio_func *func) 


	if (hdr[3] == 1) {	/* Ack */

		u32 *ack_seq = (u32 *)&hdr[4];



		spin_lock_irqsave(&tx->lock, flags);

		tx->can_send = 1;
@@ -601,8 +601,7 @@ static int gdm_sdio_receive(void *priv_dev, 
	return 0;

}



static int sdio_wimax_probe(struct sdio_func *func,

				const struct sdio_device_id *id)

static int sdio_wimax_probe(struct sdio_func *func, const struct sdio_device_id *id)

{

	int ret;

	struct phy_dev *phy_dev = NULL;

drivers/staging/gdm72xx/gdm_usb.c

+15 −28
Original line number Diff line number Diff line
@@ -344,16 +344,11 @@ static int gdm_usb_send(void *priv_dev, void *data, int len, 
	if ((len % 512) == 0)

		len++;



	usb_fill_bulk_urb(t->urb,

			usbdev,

			usb_sndbulkpipe(usbdev, 1),

			t->buf,

			len + padding,

			gdm_usb_send_complete,

			t);



	print_hex_dump_debug("usb_send: ", DUMP_PREFIX_NONE, 16, 1,

			     t->buf, len + padding, false);

	usb_fill_bulk_urb(t->urb, usbdev, usb_sndbulkpipe(usbdev, 1), t->buf,

			  len + padding, gdm_usb_send_complete, t);



	print_hex_dump_debug("usb_send: ", DUMP_PREFIX_NONE, 16, 1, t->buf,

			     len + padding, false);

#ifdef CONFIG_WIMAX_GDM72XX_USB_PM

	if (usbdev->state & USB_STATE_SUSPENDED) {

		list_add_tail(&t->p_list, &tx->pending_list);
@@ -494,13 +489,8 @@ static int gdm_usb_receive(void *priv_dev, 
	r->callback = cb;

	r->cb_data = cb_data;



	usb_fill_bulk_urb(r->urb,

			usbdev,

			usb_rcvbulkpipe(usbdev, 0x82),

			r->buf,

			RX_BUF_SIZE,

			gdm_usb_rcv_complete,

			r);

	usb_fill_bulk_urb(r->urb, usbdev, usb_rcvbulkpipe(usbdev, 0x82), r->buf,

			  RX_BUF_SIZE, gdm_usb_rcv_complete, r);



	return usb_submit_urb(r->urb, GFP_ATOMIC);

}
@@ -536,8 +526,7 @@ static void do_pm_control(struct work_struct *work) 
}

#endif /* CONFIG_WIMAX_GDM72XX_USB_PM */



static int gdm_usb_probe(struct usb_interface *intf,

				const struct usb_device_id *id)

static int gdm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)

{

	int ret = 0;

	u8 bConfigurationValue;
@@ -566,8 +555,7 @@ static int gdm_usb_probe(struct usb_interface *intf, 
	}



	/* Support for EEPROM bootloader */

	if (bConfigurationValue == DOWNLOAD_CONF_VALUE ||

		idProduct & B_DOWNLOAD) {

	if (bConfigurationValue == DOWNLOAD_CONF_VALUE || idProduct & B_DOWNLOAD) {

		ret = usb_boot(usbdev, bcdDevice);

		goto out;

	}
@@ -639,8 +627,8 @@ static void gdm_usb_disconnect(struct usb_interface *intf) 
	idProduct = L2H(usbdev->descriptor.idProduct);



	if (idProduct != EMERGENCY_PID &&

			bConfigurationValue != DOWNLOAD_CONF_VALUE &&

			(idProduct & B_DOWNLOAD) == 0) {

	    bConfigurationValue != DOWNLOAD_CONF_VALUE && (idProduct & B_DOWNLOAD) == 0) {



		udev = phy_dev->priv_dev;

		udev->usbdev = NULL;
@@ -742,8 +730,7 @@ static int k_mode_thread(void *arg) 


			spin_lock_irqsave(&tx->lock, flags);



			list_for_each_entry_safe(t, temp, &tx->pending_list,

						p_list) {

			list_for_each_entry_safe(t, temp, &tx->pending_list, p_list) {

				list_del(&t->p_list);

				ret = usb_submit_urb(t->urb, GFP_ATOMIC);

drivers/staging/gdm72xx/gdm_wimax.c

+29 −32
Original line number Diff line number Diff line
@@ -143,13 +143,13 @@ static void dump_eth_packet(struct net_device *dev, const char *title, 
		port = ntohs(uh->dest);

	} else if (protocol == ETH_P_IPV6) {

		struct ipv6hdr *i6h = (struct ipv6hdr *)data;



		uh = (struct udphdr *)((char *)i6h + sizeof(struct ipv6hdr));

		ip_protocol = i6h->nexthdr;

		port = ntohs(uh->dest);

	}



	netdev_dbg(dev, "[%s] len=%d, %s, %s, %s\n",

		title, len,

	netdev_dbg(dev, "[%s] len=%d, %s, %s, %s\n", title, len,

		   get_protocol_name(protocol),

		   get_ip_protocol_name(ip_protocol),

		   get_port_name(port));
@@ -199,6 +199,7 @@ static void gdm_wimax_event_rcv(struct net_device *dev, u16 type, void *msg, 
	u8 *buf = (u8 *)msg;

	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);



	gdm_wimax_send(nic, msg, len);
@@ -310,6 +311,7 @@ static int gdm_wimax_event_send(struct net_device *dev, char *buf, int size) 


	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);



	spin_lock_irqsave(&wm_event.evt_lock, flags);
@@ -346,8 +348,7 @@ int gdm_wimax_send_tx(struct sk_buff *skb, struct net_device *dev) 
	int ret = 0;

	struct nic *nic = netdev_priv(dev);



	ret = gdm_wimax_send_with_cb(nic, skb->data, skb->len, tx_complete,

					nic);

	ret = gdm_wimax_send_with_cb(nic, skb->data, skb->len, tx_complete, nic);

	if (ret == -ENOSPC) {

		netif_stop_queue(dev);

		ret = 0;
@@ -536,8 +537,7 @@ static void gdm_wimax_cleanup_ioctl(struct net_device *dev) 
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 *) nic->sdk_data[SIOC_DATA_FSM].buf;

	struct fsm_s *cur_fsm = (struct fsm_s *)nic->sdk_data[SIOC_DATA_FSM].buf;



	if (!cur_fsm)

		return;
@@ -582,8 +582,7 @@ static int gdm_wimax_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
			if (req->data_id == SIOC_DATA_FSM) {

				/*NOTE: gdm_update_fsm should be called

				before gdm_wimax_ioctl_set_data is called*/

				gdm_update_fsm(dev,

						(struct fsm_s *) req->data.buf);

				gdm_update_fsm(dev, (struct fsm_s *)req->data.buf);

			}

			ret = gdm_wimax_ioctl_set_data(

				&nic->sdk_data[req->data_id], &req->data);
@@ -660,8 +659,7 @@ static int gdm_wimax_hci_get_tlv(u8 *buf, u8 *T, u16 *L, u8 **V) 
	return next_pos;

}



static int gdm_wimax_get_prepared_info(struct net_device *dev, char *buf,

					int len)

static int gdm_wimax_get_prepared_info(struct net_device *dev, char *buf, int len)

{

	u8 T, *V;

	u16 L;
@@ -785,8 +783,7 @@ static void gdm_wimax_transmit_pkt(struct net_device *dev, char *buf, int len) 


	switch (cmd_evt) {

	case WIMAX_RX_SDU_AGGR:

		gdm_wimax_transmit_aggr_pkt(dev, &buf[HCI_HEADER_SIZE],

						cmd_len);

		gdm_wimax_transmit_aggr_pkt(dev, &buf[HCI_HEADER_SIZE], cmd_len);

		break;

	case WIMAX_RX_SDU:

		gdm_wimax_netif_rx(dev, &buf[HCI_HEADER_SIZE], cmd_len);

drivers/staging/gdm72xx/netlink_k.c

+2 −3
Original line number Diff line number Diff line
@@ -55,8 +55,7 @@ static void netlink_rcv_cb(struct sk_buff *skb) 
	if (skb->len >= NLMSG_HDRLEN) {

		nlh = (struct nlmsghdr *)skb->data;



		if (skb->len < nlh->nlmsg_len ||

		nlh->nlmsg_len > ND_MAX_MSG_LEN) {

		if (skb->len < nlh->nlmsg_len || nlh->nlmsg_len > ND_MAX_MSG_LEN) {

			netdev_err(skb->dev, "Invalid length (%d,%d)\n",

				   skb->len, nlh->nlmsg_len);

			return;