[PATCH V3] Staging: rtl8712 removed unnecessary else after return

[Nitin Kuppelur]

Hi Greg,

Sorry for noob question. I am still new to Kernel development.

I understood from your comment that the patch did not apply cleanly to
your tree (may be due to change in the code which I have modified)

But what should I do after this?
1) Send patch on rebased file to same mail chain with (--in-reply-to)
and [PATCH V4] ? OR
2) Create new PATCH and start new mail chain done on latest code.

Regards,
Nitin

On Thu, Oct 9, 2014 at 4:14 AM, Greg KH <gregkh at linuxfoundation.org> wrote:
> On Thu, Oct 02, 2014 at 02:32:26PM +0200, Nitin Kuppelur wrote:
>> Removed unnecessary else after return to solve
>> checkpatch.pl warning
>>
>> Signed-off-by: Nitin Kuppelur <nitinkuppelur at gmail.com>
>> ---
>>  drivers/staging/rtl8712/hal_init.c | 7 ++-----
>>  1 file changed, 2 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
>> index 81cd654..fbaba11 100644
>> --- a/drivers/staging/rtl8712/hal_init.c
>> +++ b/drivers/staging/rtl8712/hal_init.c
>> @@ -387,12 +387,9 @@ uint rtl8712_hal_deinit(struct _adapter *padapter)
>>  uint rtl871x_hal_init(struct _adapter *padapter)
>>  {
>>       padapter->hw_init_completed = false;
>> -     if (padapter->halpriv.hal_bus_init == NULL)
>> +     if (padapter->halpriv.hal_bus_init == NULL ||
>> +         padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
>>               return _FAIL;
>> -     else {
>> -             if (padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
>> -                     return _FAIL;
>> -     }
>>       if (rtl8712_hal_init(padapter) == _SUCCESS)
>>               padapter->hw_init_completed = true;
>>       else {
>
> This doesn't apply to my tree :(