summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8712/rtl8712_efuse.c
diff options
context:
space:
mode:
authorLuis de Bethencourt2015-10-19 19:15:29 +0200
committerGreg Kroah-Hartman2015-10-25 03:26:59 +0100
commit168a2c10288d78f1e8504d132f59bb407f4fb9a6 (patch)
treec97261b129a767f4427d1a8379699f3bf494a6cd /drivers/staging/rtl8712/rtl8712_efuse.c
parentstaging: rtl8712: Remove boolean comparisons (diff)
downloadkernel-qcow2-linux-168a2c10288d78f1e8504d132f59bb407f4fb9a6.tar.gz
kernel-qcow2-linux-168a2c10288d78f1e8504d132f59bb407f4fb9a6.tar.xz
kernel-qcow2-linux-168a2c10288d78f1e8504d132f59bb407f4fb9a6.zip
staging: rtl8712: braces should be used on all arms
Fix all instances of the following checkpatch.pl check: CHECK: braces {} should be used on all arms of this statement Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712/rtl8712_efuse.c')
-rw-r--r--drivers/staging/rtl8712/rtl8712_efuse.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_efuse.c b/drivers/staging/rtl8712/rtl8712_efuse.c
index 13d4b8dcf073..4dcc82632326 100644
--- a/drivers/staging/rtl8712/rtl8712_efuse.c
+++ b/drivers/staging/rtl8712/rtl8712_efuse.c
@@ -163,8 +163,9 @@ static u8 efuse_is_empty(struct _adapter *padapter, u8 *empty)
*empty = true;
else
*empty = false;
- } else
+ } else {
ret = false;
+ }
return ret;
}
@@ -229,8 +230,9 @@ u16 r8712_efuse_get_current_size(struct _adapter *padapter)
word_cnts = calculate_word_cnts(hworden);
/* read next header */
efuse_addr = efuse_addr + (word_cnts * 2) + 1;
- } else
+ } else {
bContinual = false;
+ }
}
return efuse_addr;
}
@@ -263,8 +265,9 @@ u8 r8712_efuse_pg_packet_read(struct _adapter *padapter, u8 offset, u8 *data)
if (efuse_one_byte_read(padapter,
efuse_addr+1+tmpidx, &efuse_data)) {
tmpdata[tmpidx] = efuse_data;
- } else
+ } else {
ret = false;
+ }
}
pgpacket_copy_data(hworden, tmpdata, data);
}
@@ -335,17 +338,17 @@ static u8 fix_header(struct _adapter *padapter, u8 header, u16 header_addr)
efuse_one_byte_write(padapter, addr+1,
pkt.data[i*2 + 1]);
/* additional check */
- if (!efuse_one_byte_read(padapter, addr, &value))
+ if (!efuse_one_byte_read(padapter, addr, &value)) {
ret = false;
- else if (pkt.data[i*2] != value) {
+ } else if (pkt.data[i*2] != value) {
ret = false;
if (0xFF == value) /* write again */
efuse_one_byte_write(padapter, addr,
pkt.data[i * 2]);
}
- if (!efuse_one_byte_read(padapter, addr+1, &value))
+ if (!efuse_one_byte_read(padapter, addr+1, &value)) {
ret = false;
- else if (pkt.data[i*2 + 1] != value) {
+ } else if (pkt.data[i*2 + 1] != value) {
ret = false;
if (0xFF == value) /* write again */
efuse_one_byte_write(padapter, addr+1,
@@ -503,8 +506,9 @@ u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr, u16 cnts,
if (efuse_is_empty(padapter, &empty)) {
if (empty)
memset(pktdata, 0xFF, PGPKT_DATA_SIZE);
- } else
+ } else {
return false;
+ }
offset = (addr >> 3) & 0xF;
if (!empty)
if (!r8712_efuse_pg_packet_read(padapter, offset, pktdata))