From patchwork Tue Jan 13 13:31:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5620441 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0A1AB9F3A0 for ; Tue, 13 Jan 2015 13:31:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3802420551 for ; Tue, 13 Jan 2015 13:31:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 672EE204FC for ; Tue, 13 Jan 2015 13:31:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751299AbbAMNbz (ORCPT ); Tue, 13 Jan 2015 08:31:55 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:61466 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751283AbbAMNby (ORCPT ); Tue, 13 Jan 2015 08:31:54 -0500 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue004) with ESMTPSA (Nemesis) id 0MVHys-1YH92b0W46-00Yhym; Tue, 13 Jan 2015 14:31:47 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: dmaengine@vger.kernel.org, Eric Miao , Vinod Koul , Haojian Zhuang Subject: [PATCH 2/2] dmaengine: mmp-tdma: fix terminate_all return code Date: Tue, 13 Jan 2015 14:31:46 +0100 Message-ID: <9755822.HDlnFBj4xE@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <2099590.pAO9NcseBT@wuerfel> References: <2099590.pAO9NcseBT@wuerfel> MIME-Version: 1.0 X-Provags-ID: V03:K0:hLr7qbj3puZCZ7lCmYtUoxCZO8joZqcvGDjsMK/wFqJq21oGPju PKRipI8japgKzyi7KB9qLNla59/fLbzoir3WyyUnTIQAY8gg2JbQrLlLpxjd8qbtWRl/t81 OkAlt/HFyOb+qnvvz0WWoDoCQnxhvjkxI19NOch6Ck/+lronCqbo+9Fs0rov9boXfJXJB6F 0uKT9iD7RNeAWd4J/pbmA== X-UI-Out-Filterresults: notjunk:1; Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 In a recent cleanup, the mmp_tdma_terminate_all function was introduced but does not set a proper return value. Almost no slave driver uses that return value, but if one does, the result will be undefined, which the compiler warns about: dma/mmp_tdma.c: In function 'mmp_tdma_terminate_all': dma/mmp_tdma.c:474:1: warning: no return statement in function returning non-void [-Wreturn-type] This changes the driver to return zero, like most other drivers do. Signed-off-by: Arnd Bergmann Fixes: f43a6fd400ba6 ("dmaengine: mmp-tdma: Split device_control") --- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c index 91fb241102f7..70c2fa9963cd 100644 --- a/drivers/dma/mmp_tdma.c +++ b/drivers/dma/mmp_tdma.c @@ -471,6 +471,8 @@ static int mmp_tdma_terminate_all(struct dma_chan *chan) mmp_tdma_disable_chan(chan); /* disable interrupt */ mmp_tdma_enable_irq(tdmac, false); + + return 0; } static int mmp_tdma_config(struct dma_chan *chan,