From patchwork Fri Jul 19 16:29:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2830616 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D672BC0319 for ; Fri, 19 Jul 2013 16:31:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C96432037B for ; Fri, 19 Jul 2013 16:31:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B07F320375 for ; Fri, 19 Jul 2013 16:31:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760910Ab3GSQbZ (ORCPT ); Fri, 19 Jul 2013 12:31:25 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:62668 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933381Ab3GSQ3o (ORCPT ); Fri, 19 Jul 2013 12:29:44 -0400 Received: from axis700.grange (dslb-178-006-255-036.pools.arcor-ip.net [178.6.255.36]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0LlJ5u-1USoYJ0UT8-00bHbO; Fri, 19 Jul 2013 18:29:37 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 90E7E40BB8; Fri, 19 Jul 2013 18:29:35 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1V0DYl-0007rb-6z; Fri, 19 Jul 2013 18:29:35 +0200 From: Guennadi Liakhovetski To: linux-kernel@vger.kernel.org Cc: linux-sh@vger.kernel.org, Magnus Damm , Simon Horman , Vinod Koul , Laurent Pinchart , Sergei Shtylyov , Guennadi Liakhovetski Subject: [PATCH v2 06/15] DMA: shdma: make multiplexer platform data optional Date: Fri, 19 Jul 2013 18:29:31 +0200 Message-Id: <1374251374-30186-7-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1374251374-30186-1-git-send-email-g.liakhovetski@gmx.de> References: <1374251374-30186-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:sBfcUZF1o/dqe01JKnjr5ZFODEKX2aptaB01P+rbSeT Cf7A4KDxERspZS1fmkkeIojFeap6Di3YMMlWFRB0DdNbS18PAC d8Z3zQDSHp/lRrkqEF+l0fKezsCSHJ66biTbHq57RHA25TMUQK v8JDqN+hjpS3/0dZ8X1CMKVI0JAUouNYapEqus2anQs7xG0niL YYzzNg0VSLVEwk5nKvs6a+Ui+I7sc8GO55XAQ7mAjyfj/e8L1j wg2ATVQaMUV5CrPHs8SdKOwdx2euYNFYlb+xrYDAtN+bWc3Xuy hQS31Nnf1aqR1aEBT+cH2RiUhncwJtM97awTJmhB/J348DzjFs h4z1Bf7S/zORzpfI5+Mb1VgcGcUHENKY8awFDmqyPkk+HBByp+ gRdiFvviCDtGA== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of supplying platform data to the shdma dmaengine driver via AUXDATA in the DT case, we now support platform data via an OF match table. Make platform data optional. Signed-off-by: Guennadi Liakhovetski --- drivers/dma/sh/shdma-of.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/drivers/dma/sh/shdma-of.c b/drivers/dma/sh/shdma-of.c index 11bcb05..2acf7b6 100644 --- a/drivers/dma/sh/shdma-of.c +++ b/drivers/dma/sh/shdma-of.c @@ -45,9 +45,6 @@ static int shdma_of_probe(struct platform_device *pdev) const struct of_dev_auxdata *lookup = pdev->dev.platform_data; int ret; - if (!lookup) - return -EINVAL; - ret = of_dma_controller_register(pdev->dev.of_node, shdma_of_xlate, pdev); if (ret < 0)