* [PATCH] Staging: rtl8712 removed unnecessary else after return
@ 2014-10-01 14:44 Nitin Kuppelur
2014-10-01 17:44 ` Joe Perches
0 siblings, 1 reply; 10+ messages in thread
From: Nitin Kuppelur @ 2014-10-01 14:44 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Nitin Kuppelur
Removed unnecessary else after return to solve
checkpatch.pl warning
Signed-off-by: Nitin Kuppelur <nitinkuppelur@gmail.com>
---
drivers/staging/rtl8712/hal_init.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index 81cd654..1d6ade0 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -389,10 +389,8 @@ uint rtl871x_hal_init(struct _adapter *padapter)
padapter->hw_init_completed = false;
if (padapter->halpriv.hal_bus_init == NULL)
return _FAIL;
- else {
- if (padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
- return _FAIL;
- }
+ if (padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
+ return _FAIL;
if (rtl8712_hal_init(padapter) == _SUCCESS)
padapter->hw_init_completed = true;
else {
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH] Staging: rtl8712 removed unnecessary else after return
2014-10-01 14:44 [PATCH] Staging: rtl8712 removed unnecessary else after return Nitin Kuppelur
@ 2014-10-01 17:44 ` Joe Perches
2014-10-02 7:39 ` Nitin Kuppelur
0 siblings, 1 reply; 10+ messages in thread
From: Joe Perches @ 2014-10-01 17:44 UTC (permalink / raw)
To: Nitin Kuppelur; +Cc: gregkh, devel, linux-kernel
On Wed, 2014-10-01 at 16:44 +0200, Nitin Kuppelur wrote:
> Removed unnecessary else after return to solve
> checkpatch.pl warning
[]
> diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
[]
> @@ -389,10 +389,8 @@ uint rtl871x_hal_init(struct _adapter *padapter)
> padapter->hw_init_completed = false;
> if (padapter->halpriv.hal_bus_init == NULL)
> return _FAIL;
> - else {
> - if (padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
> - return _FAIL;
> - }
> + if (padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
> + return _FAIL;
Perhaps a more common style is to use:
if (!padapter->halpriv.hal_bus_init ||
padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
return _FAIL;
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] Staging: rtl8712 removed unnecessary else after return
2014-10-01 17:44 ` Joe Perches
@ 2014-10-02 7:39 ` Nitin Kuppelur
2014-10-02 7:44 ` [PATCH V2] " Nitin Kuppelur
0 siblings, 1 reply; 10+ messages in thread
From: Nitin Kuppelur @ 2014-10-02 7:39 UTC (permalink / raw)
To: Joe Perches; +Cc: gregkh, devel, linux-kernel
>
> Perhaps a more common style is to use:
>
> if (!padapter->halpriv.hal_bus_init ||
> padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
> return _FAIL;
>
>
Agreed. I will send updated patch.
Regards,
Nitin
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH V2] Staging: rtl8712 removed unnecessary else after return
2014-10-02 7:39 ` Nitin Kuppelur
@ 2014-10-02 7:44 ` Nitin Kuppelur
2014-10-02 8:47 ` Dan Carpenter
0 siblings, 1 reply; 10+ messages in thread
From: Nitin Kuppelur @ 2014-10-02 7:44 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Nitin Kuppelur
Removed unnecessary else after return to solve
checkpatch.pl warning
Signed-off-by: Nitin Kuppelur <nitinkuppelur@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..e5878e2 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 {
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH V2] Staging: rtl8712 removed unnecessary else after return
2014-10-02 7:44 ` [PATCH V2] " Nitin Kuppelur
@ 2014-10-02 8:47 ` Dan Carpenter
2014-10-02 11:33 ` [PATCH] " Nitin Kuppelur
2014-10-02 12:32 ` [PATCH V3] " Nitin Kuppelur
0 siblings, 2 replies; 10+ messages in thread
From: Dan Carpenter @ 2014-10-02 8:47 UTC (permalink / raw)
To: Nitin Kuppelur; +Cc: gregkh, devel, linux-kernel
On Thu, Oct 02, 2014 at 09:44:06AM +0200, Nitin Kuppelur wrote:
> Removed unnecessary else after return to solve
> checkpatch.pl warning
>
> Signed-off-by: Nitin Kuppelur <nitinkuppelur@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..e5878e2 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;
Align these like this:
if (padapter->halpriv.hal_bus_init == NULL ||
padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
return _FAIL;
[tab][space][space][space][space]padapter->halpriv.hal_bus_init...
regards,
dan carpenter
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH] Staging: rtl8712 removed unnecessary else after return
2014-10-02 8:47 ` Dan Carpenter
@ 2014-10-02 11:33 ` Nitin Kuppelur
2014-10-02 12:32 ` [PATCH V3] " Nitin Kuppelur
1 sibling, 0 replies; 10+ messages in thread
From: Nitin Kuppelur @ 2014-10-02 11:33 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Nitin Kuppelur
Removed unnecessary else after return to solve
checkpatch.pl warning
Signed-off-by: Nitin Kuppelur <nitinkuppelur@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 {
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH V3] Staging: rtl8712 removed unnecessary else after return
2014-10-02 8:47 ` Dan Carpenter
2014-10-02 11:33 ` [PATCH] " Nitin Kuppelur
@ 2014-10-02 12:32 ` Nitin Kuppelur
2014-10-08 22:44 ` Greg KH
1 sibling, 1 reply; 10+ messages in thread
From: Nitin Kuppelur @ 2014-10-02 12:32 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Nitin Kuppelur
Removed unnecessary else after return to solve
checkpatch.pl warning
Signed-off-by: Nitin Kuppelur <nitinkuppelur@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 {
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH V3] Staging: rtl8712 removed unnecessary else after return
2014-10-02 12:32 ` [PATCH V3] " Nitin Kuppelur
@ 2014-10-08 22:44 ` Greg KH
2014-10-09 15:30 ` Nitin Kuppelur
0 siblings, 1 reply; 10+ messages in thread
From: Greg KH @ 2014-10-08 22:44 UTC (permalink / raw)
To: Nitin Kuppelur; +Cc: devel, linux-kernel
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@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 :(
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH V3] Staging: rtl8712 removed unnecessary else after return
2014-10-08 22:44 ` Greg KH
@ 2014-10-09 15:30 ` Nitin Kuppelur
2014-10-09 15:48 ` Greg KH
0 siblings, 1 reply; 10+ messages in thread
From: Nitin Kuppelur @ 2014-10-09 15:30 UTC (permalink / raw)
To: Greg KH; +Cc: devel, linux-kernel
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@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@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 :(
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH V3] Staging: rtl8712 removed unnecessary else after return
2014-10-09 15:30 ` Nitin Kuppelur
@ 2014-10-09 15:48 ` Greg KH
0 siblings, 0 replies; 10+ messages in thread
From: Greg KH @ 2014-10-09 15:48 UTC (permalink / raw)
To: Nitin Kuppelur; +Cc: devel, linux-kernel
A: No.
Q: Should I include quotations after my reply?
http://daringfireball.net/2007/07/on_top
On Thu, Oct 09, 2014 at 09:00:58PM +0530, Nitin Kuppelur wrote:
> 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)
Or due to changes that others made and got accepted.
> 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.
Create a new patch and new email thread please.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-10-09 15:48 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-01 14:44 [PATCH] Staging: rtl8712 removed unnecessary else after return Nitin Kuppelur
2014-10-01 17:44 ` Joe Perches
2014-10-02 7:39 ` Nitin Kuppelur
2014-10-02 7:44 ` [PATCH V2] " Nitin Kuppelur
2014-10-02 8:47 ` Dan Carpenter
2014-10-02 11:33 ` [PATCH] " Nitin Kuppelur
2014-10-02 12:32 ` [PATCH V3] " Nitin Kuppelur
2014-10-08 22:44 ` Greg KH
2014-10-09 15:30 ` Nitin Kuppelur
2014-10-09 15:48 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox