2015-11-08 07:06:43

by Ivan Safonov

[permalink] [raw]
Subject: [PATCH v2 02/12] staging: rtl8188eu: return value and argument types changed in _rtl88e_write_fw function

Ideally the function should not change the variables outside of its body.

Signed-off-by: Ivan Safonov <[email protected]>
---
drivers/staging/rtl8188eu/hal/fw.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/fw.c b/drivers/staging/rtl8188eu/hal/fw.c
index 4d72537..5b569ef 100644
--- a/drivers/staging/rtl8188eu/hal/fw.c
+++ b/drivers/staging/rtl8188eu/hal/fw.c
@@ -75,14 +75,14 @@ static void _rtl88e_fw_block_write(struct adapter *adapt,
usb_write8(adapt, write_address, byte_buffer[i]);
}

-static void _rtl88e_fill_dummy(u8 *pfwbuf, u32 *pfwlen)
+static u32 _rtl88e_fill_dummy(u8 *pfwbuf, u32 pfwlen)
{
u32 i;

- for (i = *pfwlen; i < roundup(*pfwlen, 4); i++)
+ for (i = pfwlen; i < roundup(pfwlen, 4); i++)
pfwbuf[i] = 0;

- *pfwlen = i;
+ return i;
}

static void _rtl88e_fw_page_write(struct adapter *adapt,
@@ -103,7 +103,7 @@ static void _rtl88e_write_fw(struct adapter *adapt, u8 *buffer, u32 size)
u32 page_no, remain;
u32 page, offset;

- _rtl88e_fill_dummy(buf_ptr, &size);
+ size = _rtl88e_fill_dummy(buf_ptr, size);

page_no = size / FW_8192C_PAGE_SIZE;
remain = size % FW_8192C_PAGE_SIZE;
--
2.4.10