[PATCH 14/32] dmaengine: ste_dma40: Remove 'always true' checking

[lee.jones@linaro.org (Lee Jones)]

On Thu, 25 Apr 2013, Linus Walleij wrote:

> On Thu, Apr 18, 2013 at 12:11 PM, Lee Jones <lee.jones@linaro.org> wrote:
> 
> > Before allocating memory for logical channels, the current driver
> > checks to see if there are any. Well as the dma40_memcpy_channels[]
> > array is always populated, the check is always true. Best to
> > remove the check.
> >
> > Cc: Vinod Koul <vinod.koul@intel.com>
> > Cc: Dan Williams <djbw@fb.com>
> > Cc: Per Forlin <per.forlin@stericsson.com>
> > Cc: Rabin Vincent <rabin@rab.in>
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> 
> (...)
> 
> > -       if (num_log_chans + ARRAY_SIZE(dma40_memcpy_channels)) {
> 
> So I guess this was changed when moving the memcpy channels
> into the driver.

Right.

> > -               /*
> > -                * The max number of logical channels are event lines for all
> > -                * src devices and dst devices
> > -                */
> > -               base->lookup_log_chans = kzalloc(num_log_chans *
> > -                                                sizeof(struct d40_chan *),
> > -                                                GFP_KERNEL);
> 
> And at that point you forgot to rewrite this as
> kzalloc((num_log_chans + ARRAY_SIZE(dma40_memcpy_channels)), ...)?

I guess I didn't notice that, yes.

> > -               if (!base->lookup_log_chans)
> > -                       goto failure;
> > -       }
> > +       base->lookup_log_chans = kzalloc(num_log_chans *
> > +                                        sizeof(struct d40_chan *),
> > +                                        GFP_KERNEL);
> > +       if (!base->lookup_log_chans)
> > +               goto failure;
> 
> So this change should also include the memcpy channels.
> 
> I'll go back and comment again on the patch moving the
> memcpy channels into the driver.

Okay, NP.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog