From patchwork Fri Jul 12 13:43:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2826950 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 28024C0AB2 for ; Fri, 12 Jul 2013 13:44:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 448D82015E for ; Fri, 12 Jul 2013 13:44:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E1E22015F for ; Fri, 12 Jul 2013 13:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964842Ab3GLNoW (ORCPT ); Fri, 12 Jul 2013 09:44:22 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:52669 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964914Ab3GLNoI (ORCPT ); Fri, 12 Jul 2013 09:44:08 -0400 Received: from axis700.grange (dslb-178-001-224-050.pools.arcor-ip.net [178.1.224.50]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0M5Ijf-1UFabn0uvn-00zX2x; Fri, 12 Jul 2013 15:44:00 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id E528440BB8; Fri, 12 Jul 2013 15:43:58 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1Uxdde-0004p5-MS; Fri, 12 Jul 2013 15:43:58 +0200 From: Guennadi Liakhovetski To: linux-kernel@vger.kernel.org Cc: linux-sh@vger.kernel.org, Magnus Damm , Simon Horman , Vinod Koul , Laurent Pinchart , Guennadi Liakhovetski Subject: [PATCH 7/8] DMA: shdma: make multiplexer platform data optional Date: Fri, 12 Jul 2013 15:43:57 +0200 Message-Id: <1373636638-18496-8-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1373636638-18496-1-git-send-email-g.liakhovetski@gmx.de> References: <1373636638-18496-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:d23oDVyhqApa6SfRqs5+RW0n54YAKBgBNnPSazXsHCZ l4sOlCZCPVTblL7SaPpGnwORnSmAT7M7SflE9yw8oLdy/8MWRS b/1fFCX0eVBVrjBuKfHSXU4wLFHreg2SepBdcURZF0vgu+9HOO UuDgfZhi7yYxPhpu94omVEuinFXm/7fzHeKAybyS2Hy1T8IYBL OEAFq1waryPMJcZ+ieksEOFtBphObkjZppdhKEHdK/9tPVSeaN 85rxY6LZYK5ID7RTnj0KbNUR2cBV84km4G1pjuBGW1AWsGL/ul 6XZt02cxsnQ78haP8HcbGSuiKNg1VzdajTNpjyUeNhV+eWz1yD y28MiMztmxuoRixH8qI1aIoD0T0Ygw1hBEGZdHW0AyLA641ily gNiR5Qhk2UYZg== 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.2 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 fd2fa10..e439e53 100644 --- a/drivers/dma/sh/shdma-of.c +++ b/drivers/dma/sh/shdma-of.c @@ -46,9 +46,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)