Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1387455 > unrolled thread
| Started by | Jisheng Zhang <jszhang@marvell.com> |
|---|---|
| First post | 2016-04-26 15:10 +0200 |
| Last post | 2016-04-27 09:30 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[RESEND PATCH v2 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path Jisheng Zhang <jszhang@marvell.com> - 2016-04-26 15:10 +0200
Re: [RESEND PATCH v2 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path Felipe Balbi <felipe.balbi@linux.intel.com> - 2016-04-27 07:40 +0200
Re: [RESEND PATCH v2 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path Jisheng Zhang <jszhang@marvell.com> - 2016-04-27 08:40 +0200
Re: [RESEND PATCH v2 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path Felipe Balbi <felipe.balbi@linux.intel.com> - 2016-04-27 09:30 +0200
| From | Jisheng Zhang <jszhang@marvell.com> |
|---|---|
| Date | 2016-04-26 15:10 +0200 |
| Subject | [RESEND PATCH v2 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path |
| Message-ID | <rsaUz-8ny-21@gated-at.bofh.it> |
Commit 63589e92c2d9 ("clk: Ignore error and NULL pointers passed to
clk_{unprepare, disable}()") allows NULL or error pointer to be passed
unconditionally.
This patch is to simplify probe error and remove code paths.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
drivers/usb/host/xhci-plat.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 0e69712..83669d0 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -266,8 +266,7 @@ put_usb3_hcd:
usb_put_hcd(xhci->shared_hcd);
disable_clk:
- if (!IS_ERR(clk))
- clk_disable_unprepare(clk);
+ clk_disable_unprepare(clk);
put_hcd:
usb_put_hcd(hcd);
@@ -287,8 +286,7 @@ static int xhci_plat_remove(struct platform_device *dev)
usb_remove_hcd(hcd);
usb_put_hcd(xhci->shared_hcd);
- if (!IS_ERR(clk))
- clk_disable_unprepare(clk);
+ clk_disable_unprepare(clk);
usb_put_hcd(hcd);
return 0;
--
2.8.1
[toc] | [next] | [standalone]
| From | Felipe Balbi <felipe.balbi@linux.intel.com> |
|---|---|
| Date | 2016-04-27 07:40 +0200 |
| Message-ID | <rsqmC-42B-5@gated-at.bofh.it> |
| In reply to | #1387455 |
[Multipart message — attachments visible in raw view] — view raw
Jisheng Zhang <jszhang@marvell.com> writes:
> Commit 63589e92c2d9 ("clk: Ignore error and NULL pointers passed to
> clk_{unprepare, disable}()") allows NULL or error pointer to be passed
> unconditionally.
>
> This patch is to simplify probe error and remove code paths.
this seems wrong to me. xhci->clk isn't initialized to NULL, it's either
initialized to a valid struct clk * or some ERR_PTR() value.
Care to explain ?
> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
> ---
> drivers/usb/host/xhci-plat.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index 0e69712..83669d0 100644
> --- a/drivers/usb/host/xhci-plat.c
> +++ b/drivers/usb/host/xhci-plat.c
> @@ -266,8 +266,7 @@ put_usb3_hcd:
> usb_put_hcd(xhci->shared_hcd);
>
> disable_clk:
> - if (!IS_ERR(clk))
> - clk_disable_unprepare(clk);
> + clk_disable_unprepare(clk);
>
> put_hcd:
> usb_put_hcd(hcd);
> @@ -287,8 +286,7 @@ static int xhci_plat_remove(struct platform_device *dev)
> usb_remove_hcd(hcd);
> usb_put_hcd(xhci->shared_hcd);
>
> - if (!IS_ERR(clk))
> - clk_disable_unprepare(clk);
> + clk_disable_unprepare(clk);
> usb_put_hcd(hcd);
>
> return 0;
> --
> 2.8.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
balbi
[toc] | [prev] | [next] | [standalone]
| From | Jisheng Zhang <jszhang@marvell.com> |
|---|---|
| Date | 2016-04-27 08:40 +0200 |
| Subject | Re: [RESEND PATCH v2 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path |
| Message-ID | <rsriF-4Tl-7@gated-at.bofh.it> |
| In reply to | #1388671 |
Dear Felipe,
On Wed, 27 Apr 2016 08:33:52 +0300 Felipe Balbi wrote:
> Jisheng Zhang <jszhang@marvell.com> writes:
> > Commit 63589e92c2d9 ("clk: Ignore error and NULL pointers passed to
> > clk_{unprepare, disable}()") allows NULL or error pointer to be passed
> > unconditionally.
> >
> > This patch is to simplify probe error and remove code paths.
>
> this seems wrong to me. xhci->clk isn't initialized to NULL, it's either
> initialized to a valid struct clk * or some ERR_PTR() value.
Commit 63589e92c2d9 could also ignore error value ;)
>
> Care to explain ?
>
> > Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
> > ---
> > drivers/usb/host/xhci-plat.c | 6 ++----
> > 1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> > index 0e69712..83669d0 100644
> > --- a/drivers/usb/host/xhci-plat.c
> > +++ b/drivers/usb/host/xhci-plat.c
> > @@ -266,8 +266,7 @@ put_usb3_hcd:
> > usb_put_hcd(xhci->shared_hcd);
> >
> > disable_clk:
> > - if (!IS_ERR(clk))
> > - clk_disable_unprepare(clk);
> > + clk_disable_unprepare(clk);
> >
> > put_hcd:
> > usb_put_hcd(hcd);
> > @@ -287,8 +286,7 @@ static int xhci_plat_remove(struct platform_device *dev)
> > usb_remove_hcd(hcd);
> > usb_put_hcd(xhci->shared_hcd);
> >
> > - if (!IS_ERR(clk))
> > - clk_disable_unprepare(clk);
> > + clk_disable_unprepare(clk);
> > usb_put_hcd(hcd);
> >
> > return 0;
> > --
> > 2.8.1
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
[toc] | [prev] | [next] | [standalone]
| From | Felipe Balbi <felipe.balbi@linux.intel.com> |
|---|---|
| Date | 2016-04-27 09:30 +0200 |
| Message-ID | <rss54-5GG-5@gated-at.bofh.it> |
| In reply to | #1388696 |
[Multipart message — attachments visible in raw view] — view raw
Hi,
Jisheng Zhang <jszhang@marvell.com> writes:
> Dear Felipe,
>
> On Wed, 27 Apr 2016 08:33:52 +0300 Felipe Balbi wrote:
>
>> Jisheng Zhang <jszhang@marvell.com> writes:
>> > Commit 63589e92c2d9 ("clk: Ignore error and NULL pointers passed to
>> > clk_{unprepare, disable}()") allows NULL or error pointer to be passed
>> > unconditionally.
>> >
>> > This patch is to simplify probe error and remove code paths.
>>
>> this seems wrong to me. xhci->clk isn't initialized to NULL, it's either
>> initialized to a valid struct clk * or some ERR_PTR() value.
>
> Commit 63589e92c2d9 could also ignore error value ;)
oh okay, thanks for that. That's, IMHO, quite dangerous ;-)
--
balbi
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web