[PATCH] Staging: gdm72xx Fix minor coding style problems
This is patch for fixing of minor coding style problems. Signed-off-by: Adithya K linux.challen...@gmail.com --- drivers/staging/gdm72xx/gdm_qos.c |3 ++- drivers/staging/gdm72xx/gdm_sdio.c |1 + drivers/staging/gdm72xx/gdm_usb.c |2 +- drivers/staging/gdm72xx/gdm_wimax.c |3 +++ drivers/staging/gdm72xx/usb_boot.c |1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/staging/gdm72xx/gdm_qos.c b/drivers/staging/gdm72xx/gdm_qos.c index 50d43ad..5ed32b9 100644 --- a/drivers/staging/gdm72xx/gdm_qos.c +++ b/drivers/staging/gdm72xx/gdm_qos.c @@ -229,6 +229,7 @@ static u32 extract_qos_list(struct nic *nic, struct list_head *head) 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++; @@ -377,7 +378,7 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size) index = get_csr(qcb, SFID, 1); if (index == -1) { netdev_err(nic-netdev, - QoS ERROR: csr Update Error / Wrong index (%d) \n, + QoS ERROR: csr Update Error / Wrong index (%d)\n, index); return; } diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c index c246537..4d5ccf8 100644 --- a/drivers/staging/gdm72xx/gdm_sdio.c +++ b/drivers/staging/gdm72xx/gdm_sdio.c @@ -510,6 +510,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; diff --git a/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c index 20539d8..8fd1b1f 100644 --- a/drivers/staging/gdm72xx/gdm_usb.c +++ b/drivers/staging/gdm72xx/gdm_usb.c @@ -759,7 +759,7 @@ static int k_mode_thread(void *arg) spin_lock_irqsave(k_lock, flags2); } wait_event_interruptible_lock_irq(k_wait, - !list_empty(k_list) || k_mode_stop, + !list_empty(k_list) || k_mode_stop, k_lock); spin_unlock_irqrestore(k_lock, flags2); } diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c index 05ce2a2..c44e7aa 100644 --- a/drivers/staging/gdm72xx/gdm_wimax.c +++ b/drivers/staging/gdm72xx/gdm_wimax.c @@ -143,6 +143,7 @@ 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); @@ -199,6 +200,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 +312,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); diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c index 0d45eb6..4d7c61c 100644 --- a/drivers/staging/gdm72xx/usb_boot.c +++ b/drivers/staging/gdm72xx/usb_boot.c @@ -67,6 +67,7 @@ struct fw_info { static void array_le32_to_cpu(u32 *arr, int num) { int i; + for (i = 0; i num; i++, arr++) *arr = __le32_to_cpu(*arr); } -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: gdm72xx Fix minor coding style problems
On Thu, May 08, 2014 at 11:53:57AM +0530, Adithya K wrote: This is patch for fixing of minor coding style problems. Signed-off-by: Adithya K linux.challen...@gmail.com --- drivers/staging/gdm72xx/gdm_qos.c |3 ++- drivers/staging/gdm72xx/gdm_sdio.c |1 + drivers/staging/gdm72xx/gdm_usb.c |2 +- drivers/staging/gdm72xx/gdm_wimax.c |3 +++ drivers/staging/gdm72xx/usb_boot.c |1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/staging/gdm72xx/gdm_qos.c b/drivers/staging/gdm72xx/gdm_qos.c index 50d43ad..5ed32b9 100644 --- a/drivers/staging/gdm72xx/gdm_qos.c +++ b/drivers/staging/gdm72xx/gdm_qos.c @@ -229,6 +229,7 @@ static u32 extract_qos_list(struct nic *nic, struct list_head *head) 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++; This one is wrong. It's not something I care about but since the patch needs to be redone, then please leave it out. diff --git a/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c index 20539d8..8fd1b1f 100644 --- a/drivers/staging/gdm72xx/gdm_usb.c +++ b/drivers/staging/gdm72xx/gdm_usb.c @@ -759,7 +759,7 @@ static int k_mode_thread(void *arg) spin_lock_irqsave(k_lock, flags2); } wait_event_interruptible_lock_irq(k_wait, - !list_empty(k_list) || k_mode_stop, + !list_empty(k_list) || k_mode_stop, k_lock); spin_unlock_irqrestore(k_lock, flags2); } This one is totally wrong. Please resend withouth this chunk. regards, dan carpenter ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: gdm72xx Fix minor coding style problems
On Wed, May 07, 2014 at 11:40:50PM -0700, Joe Perches wrote: On Thu, 2014-05-08 at 11:53 +0530, Adithya K wrote: This is patch for fixing of minor coding style problems. [] diff --git a/drivers/staging/gdm72xx/gdm_qos.c b/drivers/staging/gdm72xx/gdm_qos.c [] @@ -229,6 +229,7 @@ static u32 extract_qos_list(struct nic *nic, struct list_head *head) entry = list_entry( qcb-qos_list[i].prev, struct qos_entry_s, list); + list_move_tail(entry-list, head); That one is a checkpatch defect. The list_entry( use is really ugly too with bad indentation on the following line. Look at the entire function: static u32 extract_qos_list(struct nic *nic, struct list_head *head) { struct qos_cb_s *qcb = nic-qos; struct qos_entry_s *entry; int i; 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); 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); } } } } return 0; } Please consider rewriting the function to reduce unnecessary indentation. Something like: static u32 extract_qos_list(struct nic *nic, struct list_head *head) { struct qos_cb_s *qcb = nic-qos; int i; INIT_LIST_HEAD(head); for (i = 0; i QOS_MAX; i++) { if (!qcb-csr[i].enabled || qcb-csr[i].qos_buf_count = qcb-qos_limit_size) continue; if (!list_empty(qcb-qos_list[i])) { You could flip this one around as well. if (list_empty(qcb-qos_list[i]) continue; Move the rest in one indent level. struct qos_entry_s *entry; 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); } } regards, dan carpenter ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: gdm72xx Fix minor coding style problems
On Thu, 2014-05-08 at 11:53 +0530, Adithya K wrote: This is patch for fixing of minor coding style problems. [] diff --git a/drivers/staging/gdm72xx/gdm_qos.c b/drivers/staging/gdm72xx/gdm_qos.c [] @@ -229,6 +229,7 @@ static u32 extract_qos_list(struct nic *nic, struct list_head *head) entry = list_entry( qcb-qos_list[i].prev, struct qos_entry_s, list); + list_move_tail(entry-list, head); That one is a checkpatch defect. The list_entry( use is really ugly too with bad indentation on the following line. Look at the entire function: static u32 extract_qos_list(struct nic *nic, struct list_head *head) { struct qos_cb_s *qcb = nic-qos; struct qos_entry_s *entry; int i; 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); 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); } } } } return 0; } Please consider rewriting the function to reduce unnecessary indentation. Something like: static u32 extract_qos_list(struct nic *nic, struct list_head *head) { struct qos_cb_s *qcb = nic-qos; int i; INIT_LIST_HEAD(head); for (i = 0; i QOS_MAX; i++) { if (!qcb-csr[i].enabled || qcb-csr[i].qos_buf_count = qcb-qos_limit_size) continue; if (!list_empty(qcb-qos_list[i])) { struct qos_entry_s *entry; 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); } } return 0; } ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH]: Staging: gdm72xx Fix minor coding style problems
Hi All, This is patch for fixing of minor coding style problems. This is part of Eudyptula Challenge. Thanks, Adithya.K diff --git a/drivers/staging/gdm72xx/gdm_qos.c b/drivers/staging/gdm72xx/gdm_qos.c index 50d43ad..5ed32b9 100644 --- a/drivers/staging/gdm72xx/gdm_qos.c +++ b/drivers/staging/gdm72xx/gdm_qos.c @@ -229,6 +229,7 @@ static u32 extract_qos_list(struct nic *nic, struct list_head *head) 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++; @@ -377,7 +378,7 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size) index = get_csr(qcb, SFID, 1); if (index == -1) { netdev_err(nic-netdev, - QoS ERROR: csr Update Error / Wrong index (%d) \n, + QoS ERROR: csr Update Error / Wrong index (%d)\n, index); return; } diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c index c246537..4d5ccf8 100644 --- a/drivers/staging/gdm72xx/gdm_sdio.c +++ b/drivers/staging/gdm72xx/gdm_sdio.c @@ -510,6 +510,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; diff --git a/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c index 20539d8..8fd1b1f 100644 --- a/drivers/staging/gdm72xx/gdm_usb.c +++ b/drivers/staging/gdm72xx/gdm_usb.c @@ -759,7 +759,7 @@ static int k_mode_thread(void *arg) spin_lock_irqsave(k_lock, flags2); } wait_event_interruptible_lock_irq(k_wait, - !list_empty(k_list) || k_mode_stop, + !list_empty(k_list) || k_mode_stop, k_lock); spin_unlock_irqrestore(k_lock, flags2); } diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c index 05ce2a2..c44e7aa 100644 --- a/drivers/staging/gdm72xx/gdm_wimax.c +++ b/drivers/staging/gdm72xx/gdm_wimax.c @@ -143,6 +143,7 @@ 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); @@ -199,6 +200,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 +312,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); diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c index 0d45eb6..4d7c61c 100644 --- a/drivers/staging/gdm72xx/usb_boot.c +++ b/drivers/staging/gdm72xx/usb_boot.c @@ -67,6 +67,7 @@ struct fw_info { static void array_le32_to_cpu(u32 *arr, int num) { int i; + for (i = 0; i num; i++, arr++) *arr = __le32_to_cpu(*arr); } ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH]: Staging: gdm72xx Fix minor coding style problems
On Wed, May 07, 2014 at 04:05:27PM +0530, Adithya wrote: Hi All, This is patch for fixing of minor coding style problems. This is part of Eudyptula Challenge. Thanks, Adithya.K Can you please read the Documentation/SubmittingPatches file and then resend this in a format I can apply it in (i.e. a Signed-off-by: line, be sure to read the file for what that means), and in a non-mime-encoded format, and a decent changelog comment. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH]: Staging: gdm72xx Fix minor coding style problems
On Wed, May 07, 2014 at 04:05:27PM +0530, Adithya wrote: Hi All, This is patch for fixing of minor coding style problems. This is part of Eudyptula Challenge. Write what you fixed. Thanks, Adithya.K Not in the correct format. Use git send-email or read Documentation/email-clients.txt. Send it to yourself first, save the email as raw text including headers and everything. `cat raw_email.txt | git am`. Review the git log with `git log -p`. When that works then resend the patch. No Signed-off-by line. diff --git a/drivers/staging/gdm72xx/gdm_qos.c b/drivers/staging/gdm72xx/gdm_qos.c index 50d43ad..5ed32b9 100644 --- a/drivers/staging/gdm72xx/gdm_qos.c +++ b/drivers/staging/gdm72xx/gdm_qos.c @@ -229,6 +229,7 @@ static u32 extract_qos_list(struct nic *nic, struct list_head *head) 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++; This is a false positive because it sees the struct qos_entry_s, and thinks it's a declaration but it's not. Don't obey checkpatch.pl if checkpatch.pl is wrong. diff --git a/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c index 20539d8..8fd1b1f 100644 --- a/drivers/staging/gdm72xx/gdm_usb.c +++ b/drivers/staging/gdm72xx/gdm_usb.c @@ -759,7 +759,7 @@ static int k_mode_thread(void *arg) spin_lock_irqsave(k_lock, flags2); } wait_event_interruptible_lock_irq(k_wait, - !list_empty(k_list) || k_mode_stop, + !list_empty(k_list) || k_mode_stop, k_lock); spin_unlock_irqrestore(k_lock, flags2); } No. The alignment is all kinds of messed up now. The original was better. regards, dan carpenter ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel