From patchwork Tue Jul 23 10:50:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2831925 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 9131DC0319 for ; Tue, 23 Jul 2013 10:53:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B45AE201D5 for ; Tue, 23 Jul 2013 10:53:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5895201CD for ; Tue, 23 Jul 2013 10:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756626Ab3GWKu4 (ORCPT ); Tue, 23 Jul 2013 06:50:56 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:51181 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753344Ab3GWKuO (ORCPT ); Tue, 23 Jul 2013 06:50:14 -0400 Received: from axis700.grange (dslb-094-220-153-077.pools.arcor-ip.net [94.220.153.77]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0M34kR-1U9THP0PxP-00swhw; Tue, 23 Jul 2013 12:50:12 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id CAF4F40BC4; Tue, 23 Jul 2013 12:50:10 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1V1aAU-0007EG-Ca; Tue, 23 Jul 2013 12:50:10 +0200 From: Guennadi Liakhovetski To: linux-kernel@vger.kernel.org Cc: Magnus Damm , Simon Horman , Laurent Pinchart , Vinod Koul , linux-sh@vger.kernel.org, Sergei Shtylyov , Guennadi Liakhovetski Subject: [PATCH v4 06/15] DMA: shdma: make multiplexer platform data optional Date: Tue, 23 Jul 2013 12:50:00 +0200 Message-Id: <1374576609-27748-7-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1374576609-27748-1-git-send-email-g.liakhovetski@gmx.de> References: <1374576609-27748-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:GxNEUmRb8aHeDMhh5ncW+pr4wueSJDbCxOFALNqdZQU 9ZZq0YUS2kQ598/79w4mGBwLjDYuXviVixXEKoLBYBi4HSiBFD 5mN5Jm07+qkbk2J7pasuLI5UrFLHMmFK1+Kwl3SKQz/KVSwC7+ A5R9EHILuqpyRh+7woASul/wfd35uBgZmwJf7busKeTT2CDU0d +fUl5J0x8E6JM+vPZncQOlax0UQmsMBsyjEKPXZwBF0NIqCPF3 4fhi0kozEVa/BptF0AcO4+hSdMQVMSimHzwFcx2TKA+XV3XiTu pnA61JVrSrIJQizC6+PLFlOqZfF2Okq5vmjjH6Lr4u4L4ET7df +FE7uVvVX0omb3pvEaAXhch3tyuboUTxy6hhuOPMWlx/67KaYy i2CyEDE3sZzww== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 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)