Re: [Outreachy kernel] [PATCH 3/3] Staging: wilc1000: host_interface: Remove unused code

[Shivani Bhardwaj <shivanib134@gmail.com>]

On Mon, Oct 12, 2015 at 7:24 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
> On Mon, 12 Oct 2015, Shivani Bhardwaj wrote:
>
>> Remove declaration and initialization of variables that are not used
>> anywhere in the code.
>> Issue found using coccinelle.
>>
>> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
>> ---
>>  drivers/staging/wilc1000/host_interface.c | 4 ----
>>  1 file changed, 4 deletions(-)
>>
>> diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
>> index b6eea9a..9e8bbc1 100644
>> --- a/drivers/staging/wilc1000/host_interface.c
>> +++ b/drivers/staging/wilc1000/host_interface.c
>> @@ -4894,7 +4894,6 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
>>       s32 s32Error = 0;
>>       tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
>>       struct host_if_msg msg;
>> -     tenuScanConnTimer enuScanConnTimer;
>
> Got grep shows me only three uses of "tenuScanConnTimer".  One is the
> typedef, and the other two are removed by your patch.  So you could redo
> the patch and get rid of the typedef as well.
>
> Looking a bit more at the code, I see the following, which looks strange:
>
> tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
>
> As far as I can tell, hWFIDrv already has type tstrWILC_WFIDrv, so the
> cast is not necessary.  And it seems strange to have the two tests, first
>
> if (pstrWFIDrv == NULL || pfConnectResult == NULL)
>
> and then
>
> if (hWFIDrv == NULL)
>
> because the second one tests a subset of what the first one tests.
>
> Greg would also say that we don't need the type names embedded in the
> variable names either, but that would be a lot to change, especially since
> it impacts the field names too.
>
> In Coccinelle, you can make an expression metavariable that matches
> expressions of a particular type.  So
>
> @@
> type T;
> T e;
> identifier x;
> @@
>
> * T x = (T)e;
>
> will highlight initializations with useless casts.
>
> julia
>

Thanks so much, Julia. I'm applying all of this. Thank you for the
coccinelle script. Also, I want to know that I've been notified about
one of the patch of this series that it was sent before and has not
been applied. So, should I send an entirely new patch series removing
that one or even parts of the series can be applied to the tree?

>>
>>       if (pstrWFIDrv == NULL || pfConnectResult == NULL) {
>>               s32Error = -EFAULT;
>> @@ -4957,7 +4956,6 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
>>               return -EFAULT;
>>       }
>>
>> -     enuScanConnTimer = CONNECT_TIMER;
>>       pstrWFIDrv->hConnectTimer.data = (unsigned long)hWFIDrv;
>>       mod_timer(&pstrWFIDrv->hConnectTimer,
>>                 jiffies + msecs_to_jiffies(HOST_IF_CONNECT_TIMEOUT));
>> @@ -5560,7 +5558,6 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
>>       s32 s32Error = 0;
>>       tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
>>       struct host_if_msg msg;
>> -     tenuScanConnTimer enuScanConnTimer;
>>
>>       if (pstrWFIDrv == NULL || ScanResult == NULL) {
>>               PRINT_ER("pstrWFIDrv or ScanResult = NULL\n");
>> @@ -5602,7 +5599,6 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
>>               return -EINVAL;
>>       }
>>
>> -     enuScanConnTimer = SCAN_TIMER;
>>       PRINT_D(HOSTINF_DBG, ">> Starting the SCAN timer\n");
>>       pstrWFIDrv->hScanTimer.data = (unsigned long)hWFIDrv;
>>       mod_timer(&pstrWFIDrv->hScanTimer,
>> --
>> 2.1.0
>>
>> --
>> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
>> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
>> To post to this group, send email to outreachy-kernel@googlegroups.com.
>> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/d8f8cff7018b0c9905df40eaa754b53e8164324e.1444655924.git.shivanib134%40gmail.com.
>> For more options, visit https://groups.google.com/d/optout.
>>