Skip to contentSkip to conversation

staging: rtl8188eu: return value and argument types changed in _rtl88e_write_fw function

PATCH In review Ivan Safonov 2 participants 5 messages Nov 8, 2015 – Nov 10, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 2/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.

---
 drivers/staging/rtl8188eu/hal/fw.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/hal/fw.c +4 -4
index 4d72537..5b569ef 100644
@@ -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;
Signature · 1 line
2.4.10
#1 lore raw
Quoted 13 lines · Ivan Safonov

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

---
 drivers/staging/rtl8188eu/hal/fw.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/hal/fw.c +0 -0
index 4d72537..5b569ef 100644
@@ -75,14 +75,14 @@ static void _rtl88e_fw_block_write(struct adapter *adapt,
                usb_write8(adapt, write_address, byte_buffer[i]);

drivers/staging/rtl8188eu/hal/fw.c static void _rtl88e_fw_block_write(struct adapter *adapt, · line 83

Quoted 10 lines
drivers/staging/rtl8188eu/hal/fw.c +2 -2
 }
 
-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;

memset() ?

Quoted 23 lines
drivers/staging/rtl8188eu/hal/fw.c +2 -3
-       *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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
Quoted 43 lines · Andy Shevchenko
Quoted 13 lines · Ivan Safonov

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

---
  drivers/staging/rtl8188eu/hal/fw.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/hal/fw.c +0 -0
index 4d72537..5b569ef 100644
@@ -75,14 +75,14 @@ static void _rtl88e_fw_block_write(struct adapter *adapt,
                 usb_write8(adapt, write_address, byte_buffer[i]);

drivers/staging/rtl8188eu/hal/fw.c static void _rtl88e_fw_block_write(struct adapter *adapt, · line 83

Quoted 10 lines
drivers/staging/rtl8188eu/hal/fw.c +2 -2
  }
 
-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;

memset() ?

Quoted 17 lines
drivers/staging/rtl8188eu/hal/fw.c +2 -3
-       *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

Quoted 5 lines
Quoted 5 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

memset applied in another patch. Here only replacement of the function type.

#3 lore raw
Quoted 27 lines · Ivan Safonov
Quoted 26 lines · Andy Shevchenko

drivers/staging/rtl8188eu/hal/fw.c static void _rtl88e_fw_block_write(struct adapter *adapt, · line 83

Quoted 11 lines · Ivan Safonov

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

drivers/staging/rtl8188eu/hal/fw.c +2 -2
-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;

memset() ?

Quoted 10 lines
drivers/staging/rtl8188eu/hal/fw.c +1 -1
-       *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;
 
Quoted 5 lines
Quoted 2 lines

drivers/staging/rtl8188eu/hal/fw.c static void _rtl88e_write_fw(struct adapter *adapt, u8 *buffer, u32 size) · line 106

Quoted 2 lines
drivers/staging/rtl8188eu/hal/fw.c +1 -1
-       _rtl88e_fill_dummy(buf_ptr, &size);
+       size = _rtl88e_fill_dummy(buf_ptr, size);

memset applied in another patch. Here only replacement of the function type.

Since it's used only once it would be nice to replace it by plain memset() in one patch.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw
Quoted 24 lines · Andy Shevchenko
Quoted 23 lines · Ivan Safonov
Quoted 22 lines · Andy Shevchenko

drivers/staging/rtl8188eu/hal/fw.c static void _rtl88e_fw_block_write(struct adapter *adapt, · line 83

Quoted 9 lines · Ivan Safonov

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

drivers/staging/rtl8188eu/hal/fw.c +2 -2
-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;

memset() ?

Quoted 10 lines
drivers/staging/rtl8188eu/hal/fw.c +1 -1
-       *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;
 
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

drivers/staging/rtl8188eu/hal/fw.c static void _rtl88e_write_fw(struct adapter *adapt, u8 *buffer, u32 size) · line 106

Quoted 2 lines
drivers/staging/rtl8188eu/hal/fw.c +1 -1
-       _rtl88e_fill_dummy(buf_ptr, &size);
+       size = _rtl88e_fill_dummy(buf_ptr, size);

memset applied in another patch. Here only replacement of the function type.

Since it's used only once it would be nice to replace it by plain memset() in one patch.

I doubt its usefulness.
Perhaps, this function is not needed because firmware copied byte by byte.
It is function for firmware uploading (I don't know why it is so written, but in the case of the size of the firmware a multiple of 4, it can be easier):
static void _rtl88e_fw_block_write(struct adapter *adapt,
const u8 *buffer, u32 size)

{
    u32 blk_sz = sizeof(u32);
    const u8 *byte_buffer;
    const u32 *dword_buffer = (u32 *)buffer;
    u32 i, write_address, blk_cnt, remain;

    blk_cnt = size / blk_sz;
    remain = size % blk_sz;

    write_address = FW_8192C_START_ADDRESS;

    for (i = 0; i < blk_cnt; i++, write_address += blk_sz)
        usb_write32(adapt, write_address, dword_buffer[i]);

    byte_buffer = buffer + blk_cnt * blk_sz;
    for (i = 0; i < remain; i++, write_address++)
        usb_write8(adapt, write_address, byte_buffer[i]);
}