From: Michalis Pappas <mpappas@fastmail.fm>
To: Dan Carpenter <dan.carpenter@oracle.com>,
Greg KH <gregkh@linuxfoundation.org>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 6/10] staging: gdm72xx: Fixed some braces to conform with coding style
Date: Tue, 29 Apr 2014 10:15:29 +0800 [thread overview]
Message-ID: <535F0B41.40809@fastmail.fm> (raw)
In-Reply-To: <535F0866.2060207@fastmail.fm>
Fixed some braces to conform with coding style
Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>
---
drivers/staging/gdm72xx/gdm_wimax.c | 16 ++++++++--------
drivers/staging/gdm72xx/netlink_k.c | 7 ++++---
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c
index 05ce2a2..814d2e4 100644
--- a/drivers/staging/gdm72xx/gdm_wimax.c
+++ b/drivers/staging/gdm72xx/gdm_wimax.c
@@ -263,9 +263,9 @@ static struct evt_entry *get_event_entry(void)
{
struct evt_entry *e;
- if (list_empty(&wm_event.freeq))
+ if (list_empty(&wm_event.freeq)) {
e = alloc_event_entry();
- else {
+ } else {
e = list_entry(wm_event.freeq.next, struct evt_entry, list);
list_del(&e->list);
}
@@ -379,9 +379,9 @@ static int gdm_wimax_tx(struct sk_buff *skb, struct net_device *dev)
}
#if !defined(LOOPBACK_TEST)
- if (!fsm)
+ if (!fsm) {
netdev_err(dev, "ASSERTION ERROR: fsm is NULL!!\n");
- else if (fsm->m_status != M_CONNECTED) {
+ } else if (fsm->m_status != M_CONNECTED) {
netdev_emerg(dev, "ASSERTION ERROR: Device is NOT ready. status=%d\n",
fsm->m_status);
kfree_skb(skb);
@@ -544,9 +544,9 @@ static void gdm_update_fsm(struct net_device *dev, struct fsm_s *new_fsm)
if (cur_fsm->m_status != new_fsm->m_status ||
cur_fsm->c_status != new_fsm->c_status) {
- if (new_fsm->m_status == M_CONNECTED)
+ if (new_fsm->m_status == M_CONNECTED) {
netif_carrier_on(dev);
- else if (cur_fsm->m_status == M_CONNECTED) {
+ } else if (cur_fsm->m_status == M_CONNECTED) {
netif_carrier_off(dev);
#if defined(CONFIG_WIMAX_GDM72XX_QOS)
gdm_qos_release_list(nic);
@@ -855,9 +855,9 @@ static void prepare_rx_complete(void *arg, void *data, int len)
int ret;
ret = gdm_wimax_get_prepared_info(nic->netdev, data, len);
- if (ret == 1)
+ if (ret == 1) {
gdm_wimax_rcv_with_cb(nic, rx_complete, nic);
- else {
+ } else {
if (ret < 0)
netdev_err(nic->netdev,
"get_prepared_info failed(%d)\n", ret);
diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index af7f1c1..52317c7 100644
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -75,8 +75,9 @@ static void netlink_rcv_cb(struct sk_buff *skb)
netdev_err(skb->dev,
"dev_get_by_index(%d) is not found.\n",
ifindex);
- } else
+ } else {
netdev_err(skb->dev, "Unregistered Callback\n");
+ }
}
}
@@ -144,9 +145,9 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
ret = netlink_broadcast(sock, skb, 0, group+1, GFP_ATOMIC);
- if (!ret)
+ if (!ret) {
return len;
- else {
+ } else {
if (ret != -ESRCH) {
pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
group, type, len, ret);
--
1.8.4
next prev parent reply other threads:[~2014-04-29 2:16 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-21 8:34 [PATCH 0/3] staging: gdm72xx: Minor cleanup Michalis Pappas
2014-03-21 8:36 ` [PATCH 1/3] staging: gdm72xx: Coding style fixes Michalis Pappas
2014-03-21 8:37 ` [PATCH 2/3] staging: gdm72xx: Removed task from TODO list Michalis Pappas
2014-03-21 8:39 ` [PATCH 3/3] staging: gdm72xx: Removed direct comparisons on jiffies Michalis Pappas
2014-04-18 22:52 ` [PATCH 0/3] staging: gdm72xx: Minor cleanup Greg KH
2014-04-20 3:34 ` [PATCH v2 " Michalis Pappas
2014-04-20 3:35 ` [PATCH v2 1/3] " Michalis Pappas
2014-04-20 3:36 ` [PATCH v2 2/3] " Michalis Pappas
2014-04-22 9:32 ` Dan Carpenter
2014-04-20 3:37 ` [PATCH v2 3/3] " Michalis Pappas
2014-04-22 9:37 ` Dan Carpenter
2014-04-23 0:39 ` [PATCH v3 0/3] " Michalis Pappas
2014-04-23 0:40 ` [PATCH v3 1/3] staging: gdm72xx: Coding style fixes Michalis Pappas
2014-04-23 0:44 ` [PATCH v3 2/3] staging: gdm72xx: Removed completed task from TODO list Michalis Pappas
2014-04-23 0:45 ` [PATCH v3 3/3] staging: gdm72xx: Removed direct comparisons on jiffies Michalis Pappas
2014-04-23 8:04 ` [PATCH v3 0/3] staging: gdm72xx: Minor cleanup Dan Carpenter
2014-04-23 8:49 ` Michalis Pappas
2014-04-23 9:05 ` Dan Carpenter
2014-04-23 9:09 ` Dan Carpenter
2014-04-29 2:03 ` [PATCH v4 0/3] staging: gdm72xx: Code cleanup Michalis Pappas
2014-04-29 2:05 ` [PATCH v4 1/10] staging: gdm72xx: Removed unnecessary extern declarations from header files Michalis Pappas
2014-04-29 2:07 ` [PATCH v4 2/10] staging: gdm72xx: Replaced comparisons on jiffies values with wrap-safe functions Michalis Pappas
2014-04-29 2:09 ` [PATCH v4 3/10] staging: gdm72xx: Modified struct allocation to match coding standards Michalis Pappas
2014-04-29 2:11 ` [PATCH v4 4/10] staging: gdm72xx: Moved logical continuation to previous line to conform to coding style Michalis Pappas
2014-04-29 2:13 ` [PATCH v4 5/10] staging: gdm72xx: Fixed some camelCase variables Michalis Pappas
2014-04-29 2:15 ` Michalis Pappas [this message]
2014-04-29 2:17 ` [PATCH v4 7/10] staging: gdm72xx: Removed commented-out code Michalis Pappas
2014-04-29 2:20 ` [PATCH v4 8/10] staging: gdm72xx: Whitespace fixes to conform to coding standards Michalis Pappas
2014-04-29 2:22 ` [PATCH v4 9/10] staging: gdm72xx: Indentation and other whitespace fixes Michalis Pappas
2014-04-29 2:23 ` [PATCH v4 10/10] staging: gdm72xx: Removed task from TODO list Michalis Pappas
2014-05-09 10:05 ` [PATCH v5 0/10] staging: gdm72xx: Code cleanup Michalis Pappas
2014-05-09 10:08 ` [PATCH v5 01/10] staging: gdm72xx: Remove unnecessary extern declarations from header files Michalis Pappas
2014-05-09 10:08 ` [PATCH v5 02/10] staging: gdm72xx: Replace comparisons on jiffies values with wrap-safe functions Michalis Pappas
2014-05-09 10:08 ` [PATCH v5 03/10] staging: gdm72xx: Modify a struct allocation to match coding standards Michalis Pappas
2014-05-09 10:08 ` [PATCH v5 04/10] staging: gdm72xx: Move logical continuation to previous line to conform to coding style Michalis Pappas
2014-05-09 10:08 ` [PATCH v5 05/10] staging: gdm72xx: Fix some camel-case variables Michalis Pappas
2014-05-09 10:08 ` [PATCH v5 06/10] staging: gdm72xx: Fix braces to conform with coding style Michalis Pappas
2014-05-09 10:08 ` [PATCH v5 07/10] staging: gdm72xx: Removed commented-out code Michalis Pappas
2014-05-09 10:08 ` [PATCH v5 08/10] staging: gdm72xx: Whitespace fixes to conform to coding standards Michalis Pappas
2014-05-09 10:08 ` [PATCH v5 09/10] staging: gdm72xx: Indentation and other whitespace fixes Michalis Pappas
2014-05-09 10:08 ` [PATCH v5 10/10] staging: gdm72xx: Remove task from TODO list Michalis Pappas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=535F0B41.40809@fastmail.fm \
--to=mpappas@fastmail.fm \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).