From patchwork Fri Mar 19 04:46:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 86874 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2J4krh4016533 for ; Fri, 19 Mar 2010 04:46:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751118Ab0CSEqw (ORCPT ); Fri, 19 Mar 2010 00:46:52 -0400 Received: from mail-gw0-f46.google.com ([74.125.83.46]:52896 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751087Ab0CSEqw (ORCPT ); Fri, 19 Mar 2010 00:46:52 -0400 Received: by gwaa12 with SMTP id a12so1211225gwa.19 for ; Thu, 18 Mar 2010 21:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=AocPM8jkXsi1xTJT/lB7b7pwcXzjntZn7sPIkHRp4OQ=; b=GSJbTJjvzb4RdpLQ8Sw2V0QMkB9tYu8uhQEa1JgK1YJnDIFrJgnjG2SG28u8Fa8Wr8 x7KXrjNzhYibTCScqn25G/aAOL4GjKqx492s1qIX3M9cLbt9B3sye/bHXXHJOtw1urxy XOvDM2dOVCk2IlRabm0H3j6/1Stej2SavTCV0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=fDDxezkziUHzRGsCMio1rIr5FV2aDT5pzycfVOUrob6wjIBVH6J5vSTgSOw4Owg/h1 lT1uceW93k3TnKimSbODbNc/5dUK3otNB4yU46clpemqB+JvxBFFcLbcTqKbq9Xw1GGz KdpzJ6RHB1XfaQsl9D5xIqIXIbw6gNcR2EpHQ= Received: by 10.101.34.9 with SMTP id m9mr5281979anj.57.1268974005278; Thu, 18 Mar 2010 21:46:45 -0700 (PDT) Received: from [127.0.0.1] (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id 16sm439331gxk.1.2010.03.18.21.46.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 18 Mar 2010 21:46:44 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org, dan.j.williams@intel.com, iwamatsu@nigauri.org, g.liakhovetski@gmx.de Date: Fri, 19 Mar 2010 13:46:47 +0900 Message-Id: <20100319044647.17051.25902.sendpatchset@t400s> In-Reply-To: <20100319044630.17051.16445.sendpatchset@t400s> References: <20100319044630.17051.16445.sendpatchset@t400s> Subject: [PATCH 02/05] dmaengine: shdma: Common SH_DMA_SLAVE_NUMBER Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 19 Mar 2010 04:46:53 +0000 (UTC) --- 0003/arch/sh/include/asm/dmaengine.h +++ work/arch/sh/include/asm/dmaengine.h 2010-03-18 16:42:03.000000000 +0900 @@ -34,7 +34,6 @@ enum { SHDMA_SLAVE_SIUA_RX, SHDMA_SLAVE_SIUB_TX, SHDMA_SLAVE_SIUB_RX, - SHDMA_SLAVE_NUMBER, /* Must stay last */ }; struct sh_dmae_slave_config { --- 0003/drivers/dma/shdma.c +++ work/drivers/dma/shdma.c 2010-03-18 16:42:15.000000000 +0900 @@ -44,7 +44,7 @@ enum sh_dmae_desc_status { #define LOG2_DEFAULT_XFER_SIZE 2 /* A bitmask with bits enough for enum sh_dmae_slave_chan_id */ -static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SHDMA_SLAVE_NUMBER)]; +static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SH_DMA_SLAVE_NUMBER)]; static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all); @@ -274,7 +274,7 @@ static struct sh_dmae_slave_config *sh_d struct sh_dmae_pdata *pdata = shdev->pdata; int i; - if (param->slave_id >= SHDMA_SLAVE_NUMBER) + if (param->slave_id >= SH_DMA_SLAVE_NUMBER) return NULL; for (i = 0; i < pdata->slave_num; i++) --- 0001/drivers/dma/shdma.h +++ work/drivers/dma/shdma.h 2010-03-18 16:42:03.000000000 +0900 @@ -19,6 +19,7 @@ #include +#define SH_DMA_SLAVE_NUMBER 256 #define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */ struct device;