From patchwork Thu Jun 3 17:27:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juha.Kuikka@elektrobit.com X-Patchwork-Id: 104146 Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o53HVE9L015500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 3 Jun 2010 17:31:56 GMT Received: from dlep36.itg.ti.com ([157.170.170.91]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o53HT9CD007057 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Jun 2010 12:29:09 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id o53HT9TL002450; Thu, 3 Jun 2010 12:29:09 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 6D3378062F; Thu, 3 Jun 2010 12:29:08 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id 0798080627 for ; Thu, 3 Jun 2010 12:27:45 -0500 (CDT) Received: from red.ext.ti.com (localhost [127.0.0.1]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id o53HRirA022994 for ; Thu, 3 Jun 2010 12:27:44 -0500 (CDT) Received: from psmtp.com (na3sys009amx229.postini.com [74.125.149.113]) by red.ext.ti.com (8.13.7/8.13.7) with SMTP id o53HRhbo006556 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 3 Jun 2010 12:27:44 -0500 Received: from source ([207.170.229.72]) (using TLSv1) by na3sys009amx229.postini.com ([74.125.148.10]) with SMTP; Thu, 03 Jun 2010 12:27:44 CDT Received: from usrdes03.ebgroup.elektrobit.com (usrdes03.ebgroup.elektrobit.com [172.18.145.10]) by smtpgw2us.elektrobit.com (8.13.8/8.13.8) with ESMTP id o53HRgko025604 for ; Thu, 3 Jun 2010 10:27:42 -0700 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Subject: [PATCH 2/2] Davinci-EDMA: Use default event queue numbers from platform data to initialize channels. Date: Thu, 3 Jun 2010 10:27:42 -0700 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH 2/2] Davinci-EDMA: Use default event queue numbers from platform data to initialize channels. Thread-Index: AcsDQhJZ4UXP1maLQmy8ERdP4AQGDQ== From: To: X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 03 Jun 2010 17:32:01 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (smtpgw2us.elektrobit.com [10.127.1.12]); Thu, 03 Jun 2010 10:27:42 -0700 (PDT) X-Virus-Scanned: at elektrobit.com Content-Disposition: inline X-Scanned-By: MIMEDefang 2.67 on 10.127.1.12 X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.5000) s cv gt3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] X-Mailman-Approved-At: Thu, 03 Jun 2010 12:29:03 -0500 X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c index d33827a..24bf27c 100644 --- a/arch/arm/mach-davinci/dma.c +++ b/arch/arm/mach-davinci/dma.c @@ -1433,8 +1433,6 @@ static int __init edma_probe(struct platform_device *pdev) edma_cc[j]->num_cc = min_t(unsigned, info[j].n_cc, EDMA_MAX_CC); edma_cc[j]->default_queue = info[j].default_queue; - if (!edma_cc[j]->default_queue) - edma_cc[j]->default_queue = EVENTQ_1;