Search Linux Wireless

Re: [PATCH 1/3] staging: wilc1000: wilc_wlan_cfg_commit(): replace integer with pointer

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 2015년 07월 10일 15:20, Julian Calaby wrote:
Hi Johnny,

On Fri, Jul 10, 2015 at 3:55 PM, Johnny Kim <johnny.kim@xxxxxxxxx> wrote:
A argument of wilc_wlan_cfg_commit() is address of structure.
But because the size is restricted to 32bit, it is not correct
for 64bit machine.

So, this changes the interger value to obvious structure pointer.

Signed-off-by: Johnny Kim <johnny.kim@xxxxxxxxx>
---
  drivers/staging/wilc1000/wilc_wlan.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index def72fd..d32e45e 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1862,13 +1862,13 @@ static void wilc_wlan_cleanup(void)

  }

-static int wilc_wlan_cfg_commit(int type, uint32_t drvHandler)
+static int wilc_wlan_cfg_commit(int type, tstrWILC_WFIDrv *drvHandler)
  {
         wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
         wilc_cfg_frame_t *cfg = &p->cfg_frame;
         int total_len = p->cfg_frame_offset + 4 + DRIVER_HANDLER_SIZE;
         int seq_no = p->cfg_seq_no % 256;
-       int driver_handler = (u32)drvHandler;
+       uintptr_t driver_handler = (uintptr_t)drvHandler;
Er, why not just remove this variable and use drvHandler directly?
A control packet with the address value is sent to chipset.
Namely, it is used to distinguish various packet via the address finally.
@@ -1923,7 +1923,7 @@ static int wilc_wlan_cfg_set(int start, uint32_t wid, uint8_t *buffer, uint32_t
                 p->cfg_frame_in_use = 1;

                 /*Edited by Amr - BugID_4720*/
-               if (wilc_wlan_cfg_commit(WILC_CFG_SET, drvHandler))
+               if (wilc_wlan_cfg_commit(WILC_CFG_SET, (tstrWILC_WFIDrv *)drvHandler))
No need to cast it to it's own type.
drvHandler value is u32 integer. So I thought I need to cast it. I will remove the patch as your opinion.
                         ret_size = 0;   /* BugID_5213 */

                 if (p->os_func.os_wait(p->cfg_wait, CFG_PKTS_TIMEOUT)) {
@@ -1960,7 +1960,7 @@ static int wilc_wlan_cfg_get(int start, uint32_t wid, int commit, uint32_t drvHa
                 p->cfg_frame_in_use = 1;

                 /*Edited by Amr - BugID_4720*/
-               if (wilc_wlan_cfg_commit(WILC_CFG_QUERY, drvHandler))
+               if (wilc_wlan_cfg_commit(WILC_CFG_QUERY, (tstrWILC_WFIDrv *)drvHandler))
Ditto.

Thanks,

Thanks.

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Wireless Personal Area Network]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Hiking]     [MIPS Linux]     [ARM Linux]     [Linux RAID]

  Powered by Linux