Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1284869 > unrolled thread

[PATCH] usb: host: iounmap before return

Started by"Geyslan G. Bem" <geyslan@gmail.com>
First post2015-12-06 14:50 +0100
Last post2015-12-08 00:50 +0100
Articles 5 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] usb: host: iounmap before return "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-06 14:50 +0100
    Re: [PATCH] usb: host: iounmap before return Lu Baolu <baolu.lu@linux.intel.com> - 2015-12-07 10:40 +0100
      Re: [PATCH] usb: host: iounmap before return "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-07 11:30 +0100
      Re: [PATCH] usb: host: iounmap before return Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-12-07 12:40 +0100
        Re: [PATCH] usb: host: iounmap before return "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-08 00:50 +0100

#1284869 — [PATCH] usb: host: iounmap before return

From"Geyslan G. Bem" <geyslan@gmail.com>
Date2015-12-06 14:50 +0100
Subject[PATCH] usb: host: iounmap before return
Message-ID<qCHRn-7zu-11@gated-at.bofh.it>
This patch fixes a 'quirk_usb_handoff_xhci()' branch return that was not unmapping correctly.

Coccinelle: scripts/coccinelle/free/iounmap.cocci

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
---
 drivers/usb/host/pci-quirks.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index f940056..64150dd 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -990,7 +990,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
 			/* We're reading garbage from the controller */
 			dev_warn(&pdev->dev,
 				 "xHCI controller failing to respond");
-			return;
+			goto out;
 		}
 
 		if (!ext_cap_offset)
@@ -1062,6 +1062,7 @@ hc_init:
 			 XHCI_MAX_HALT_USEC, val);
 	}
 
+out:
 	iounmap(base);
 }
 
-- 
2.6.3

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

[toc] | [next] | [standalone]


#1285141

FromLu Baolu <baolu.lu@linux.intel.com>
Date2015-12-07 10:40 +0100
Message-ID<qD0r1-2GA-21@gated-at.bofh.it>
In reply to#1284869

On 12/06/2015 09:47 PM, Geyslan G. Bem wrote:
> This patch fixes a 'quirk_usb_handoff_xhci()' branch return that was not unmapping correctly.
>
> Coccinelle: scripts/coccinelle/free/iounmap.cocci
>
> Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
> ---
>  drivers/usb/host/pci-quirks.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
> index f940056..64150dd 100644
> --- a/drivers/usb/host/pci-quirks.c
> +++ b/drivers/usb/host/pci-quirks.c
> @@ -990,7 +990,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
>  			/* We're reading garbage from the controller */
>  			dev_warn(&pdev->dev,
>  				 "xHCI controller failing to respond");
> -			return;
> +			goto out;

If "out" is only used here, why not iounmap and return directly here?

>  		}
>  
>  		if (!ext_cap_offset)
> @@ -1062,6 +1062,7 @@ hc_init:
>  			 XHCI_MAX_HALT_USEC, val);
>  	}
>  
> +out:
>  	iounmap(base);
>  }
>  

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

[toc] | [prev] | [next] | [standalone]


#1285185

From"Geyslan G. Bem" <geyslan@gmail.com>
Date2015-12-07 11:30 +0100
Message-ID<qD1dp-3eK-29@gated-at.bofh.it>
In reply to#1285141
2015-12-07 6:30 GMT-03:00 Lu Baolu <baolu.lu@linux.intel.com>:
>
>
> On 12/06/2015 09:47 PM, Geyslan G. Bem wrote:
>> This patch fixes a 'quirk_usb_handoff_xhci()' branch return that was not unmapping correctly.
>>
>> Coccinelle: scripts/coccinelle/free/iounmap.cocci
>>
>> Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
>> ---
>>  drivers/usb/host/pci-quirks.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
>> index f940056..64150dd 100644
>> --- a/drivers/usb/host/pci-quirks.c
>> +++ b/drivers/usb/host/pci-quirks.c
>> @@ -990,7 +990,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
>>                       /* We're reading garbage from the controller */
>>                       dev_warn(&pdev->dev,
>>                                "xHCI controller failing to respond");
>> -                     return;
>> +                     goto out;
>
> If "out" is only used here, why not iounmap and return directly here?
Could be directly. I just think that code recurrence can make things
complicated in future. What do you think?

Ah, seems that this patch is not aligned with linux-next. I'll make a
new one soon.

>
>>               }
>>
>>               if (!ext_cap_offset)
>> @@ -1062,6 +1062,7 @@ hc_init:
>>                        XHCI_MAX_HALT_USEC, val);
>>       }
>>
>> +out:
>>       iounmap(base);
>>  }
>>
>



-- 
Regards,

Geyslan G. Bem
hackingbits.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1285224

FromSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date2015-12-07 12:40 +0100
Message-ID<qD2j7-3R5-3@gated-at.bofh.it>
In reply to#1285141
Hello.

On 12/07/2015 12:30 PM, Lu Baolu wrote:

>> This patch fixes a 'quirk_usb_handoff_xhci()' branch return that was not unmapping correctly.
>>
>> Coccinelle: scripts/coccinelle/free/iounmap.cocci
>>
>> Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
>> ---
>>   drivers/usb/host/pci-quirks.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
>> index f940056..64150dd 100644
>> --- a/drivers/usb/host/pci-quirks.c
>> +++ b/drivers/usb/host/pci-quirks.c
>> @@ -990,7 +990,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
>>   			/* We're reading garbage from the controller */
>>   			dev_warn(&pdev->dev,
>>   				 "xHCI controller failing to respond");
>> -			return;
>> +			goto out;
>
> If "out" is only used here, why not iounmap and return directly here?

    Why repeat the code? Nah, bad idea.

>>   		}
>>
>>   		if (!ext_cap_offset)
>> @@ -1062,6 +1062,7 @@ hc_init:
>>   			 XHCI_MAX_HALT_USEC, val);
>>   	}
>>
>> +out:
>>   	iounmap(base);
>>   }
>>

MBR, Sergei

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

[toc] | [prev] | [next] | [standalone]


#1286109

From"Geyslan G. Bem" <geyslan@gmail.com>
Date2015-12-08 00:50 +0100
Message-ID<qDdHz-2YK-5@gated-at.bofh.it>
In reply to#1285224
2015-12-07 8:37 GMT-03:00 Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>:
> Hello.
>
> On 12/07/2015 12:30 PM, Lu Baolu wrote:
>
>>> This patch fixes a 'quirk_usb_handoff_xhci()' branch return that was not
>>> unmapping correctly.
>>>
>>> Coccinelle: scripts/coccinelle/free/iounmap.cocci
>>>
>>> Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
>>> ---
>>>   drivers/usb/host/pci-quirks.c | 3 ++-
>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/usb/host/pci-quirks.c
>>> b/drivers/usb/host/pci-quirks.c
>>> index f940056..64150dd 100644
>>> --- a/drivers/usb/host/pci-quirks.c
>>> +++ b/drivers/usb/host/pci-quirks.c
>>> @@ -990,7 +990,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev
>>> *pdev)
>>>                         /* We're reading garbage from the controller */
>>>                         dev_warn(&pdev->dev,
>>>                                  "xHCI controller failing to respond");
>>> -                       return;
>>> +                       goto out;
>>
>>
>> If "out" is only used here, why not iounmap and return directly here?
>
>
>    Why repeat the code? Nah, bad idea.
>
>>>                 }
>>>
>>>                 if (!ext_cap_offset)
>>> @@ -1062,6 +1062,7 @@ hc_init:
>>>                          XHCI_MAX_HALT_USEC, val);
>>>         }
>>>
>>> +out:
>>>         iounmap(base);
>>>   }
>>>
>
> MBR, Sergei
>

Look for:
[PATCH v2] usb: host: iounmap before return


-- 
Regards,

Geyslan G. Bem
hackingbits.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web