Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932080Ab3DYJR4 (ORCPT ); Thu, 25 Apr 2013 05:17:56 -0400 Received: from mail-ie0-f172.google.com ([209.85.223.172]:38842 "EHLO mail-ie0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756543Ab3DYJRx (ORCPT ); Thu, 25 Apr 2013 05:17:53 -0400 MIME-Version: 1.0 In-Reply-To: <1366279934-30761-15-git-send-email-lee.jones@linaro.org> References: <1366279934-30761-1-git-send-email-lee.jones@linaro.org> <1366279934-30761-15-git-send-email-lee.jones@linaro.org> Date: Thu, 25 Apr 2013 11:17:53 +0200 Message-ID: Subject: Re: [PATCH 14/32] dmaengine: ste_dma40: Remove 'always true' checking From: Linus Walleij To: Lee Jones Cc: "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Arnd Bergmann , Linus WALLEIJ , Vinod Koul , Dan Williams , Per Forlin , Rabin Vincent Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1921 Lines: 52 On Thu, Apr 18, 2013 at 12:11 PM, Lee Jones 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 > Cc: Dan Williams > Cc: Per Forlin > Cc: Rabin Vincent > Signed-off-by: Lee Jones (...) > - if (num_log_chans + ARRAY_SIZE(dma40_memcpy_channels)) { So I guess this was changed when moving the memcpy channels into the driver. > - /* > - * 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)), ...)? > - 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. Yours, Linus Walleij -- 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/