Re: [PATCH v6 2/3] usb: musb: da8xx: Use devm in probe

From: Bin Liu
Date: Mon Sep 12 2016 - 13:20:44 EST


Hi,

On Tue, Sep 06, 2016 at 02:17:03PM -0500, Bin Liu wrote:
> Hi,
>
> On Mon, Sep 05, 2016 at 03:00:32PM -0500, David Lechner wrote:
> > Simplify things a bit by using devm functions where possible.
> >
> > Signed-off-by: David Lechner <david@xxxxxxxxxxxxxx>
> > ---
> > drivers/usb/musb/da8xx.c | 19 +++++--------------
> > 1 file changed, 5 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
> > index b03d3b8..0c1997c 100644
> > --- a/drivers/usb/musb/da8xx.c
> > +++ b/drivers/usb/musb/da8xx.c
> > @@ -490,20 +490,18 @@ static int da8xx_probe(struct platform_device *pdev)
> > struct da8xx_glue *glue;
> > struct platform_device_info pinfo;
> > struct clk *clk;
> > + int ret;
> >
> > - int ret = -ENOMEM;
> > -
> > - glue = kzalloc(sizeof(*glue), GFP_KERNEL);
> > + glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
> > if (!glue) {
> > dev_err(&pdev->dev, "failed to allocate glue context\n");
>
> Greg's usb-next already has a patch which drops this line. You might
> have to rebase this patch, so that it can go to v4.9-rc1.

I fixed the merge conflict locally.

Regards,
-Bin.