From patchwork Thu Sep 15 15:50:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101777 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp24185qgf; Thu, 15 Sep 2016 08:51:56 -0700 (PDT) X-Received: by 10.66.144.200 with SMTP id so8mr15573817pab.94.1473954716413; Thu, 15 Sep 2016 08:51:56 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c9si4784876pas.141.2016.09.15.08.51.56; Thu, 15 Sep 2016 08:51:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752915AbcIOPvx (ORCPT + 27 others); Thu, 15 Sep 2016 11:51:53 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:49355 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750772AbcIOPvo (ORCPT ); Thu, 15 Sep 2016 11:51:44 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue003) with ESMTPA (Nemesis) id 0Lj7Ag-1b9aZ41Fp0-00dIIZ; Thu, 15 Sep 2016 17:51:20 +0200 From: Arnd Bergmann To: Vinod Koul Cc: Arnd Bergmann , Dan Williams , Fabio Estevam , Peter Senna Tschudin , Greg Kroah-Hartman , Nandor Han , Dave Jiang , Michael Olbrich , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dmaengine: imx-sdma: fix merge conflict Date: Thu, 15 Sep 2016 17:50:49 +0200 Message-Id: <20160915155118.3008739-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:JiThIMdv6CtAyeCGVjZ+5Nbp56DLpqAW+oWsoSrI3J7ca4nF8RF n/bthZK5IUEoVbWAORuZvJy6rojPBfBXmv3Exl8f8uWxMqv/5QDNTqCIZJRMfTFvTdxFyJi 039zeWrQRw5JoZkf/EqnuLv59fKjawmf5A+3OLix1D2eeZ72fcfyr2BQCKWKIImBVlIW+nG XWz+lPF+NyVJscaViw27Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:J5abn/nk2lw=:WcV24KWsEhs5Y1toN7tXh/ INXj5SSDVZqUKuKC2kOYQuVvJOJoxRijjFeKJLgZJUaj15vbF6t1oxXdHzgCl37/lE8VrjJvJ VJ+72WEiByH/SXBeUwhGs+p/hzs1A2NgzSsGJsIEztRC4JmwKq1Up0zS7QfSyrGfLJsVqsFjS GfN8DhNwUeS/HR8mpHkjX146UyeHAUYOPYLkMFs7YAzbzCG6hnyDsfAn5WIejGSKjeocQMNQy w9AIUJwcbtDyRGYShVVcToOqMXkT1beELSqipfTORngD4JP6xtTQTDPOuoD8e/MAL+n0JXJt2 Or52fd9WJ4fKUHxZKDu6pT+ntPrL6UyqDigYde82RE2UPr7yrmHI2GpAgtfxIcrMNO1RX/YDn /hSHjPHuCYmc1t7gw2Wte/N/Zn9iPORiUVHmaWBGh0GApAQzGUZUuTij75Xax29P4/fjLNdS6 XtfoLOAgqdXKnT+SgikXUnbkXi0B3EX88qZaFLAC3weno+U5XW/LTG5DNtwUmJsn3tSzIty4E blzpzkAasDoU4fANsf0zAWMC2UHHgwaPM3RNFbtbp8iqylKW6KnJW2VcnKYm0M2X/6zAoL3jW ZKhLmPGZHhyiOiKcSUZaVw4q9RNT/VtisEQaecD78RBzxikSHXJz3DGMpzJfES409AJ7jTIvN AVPI5Pvhz+BhPjcmJyFCkOKzuSvRePg3A8U36c4orgTLdmtMV6r0CydfIWs+cEtA0sFI= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The sdma_handle_channel_loop() function was modified in one patch and removed in another, and the merge between those patches left an unused function in place: drivers/dma/imx-sdma.c:673:13: error: 'sdma_handle_channel_loop' defined but not used [-Werror=unused-function] This removes it again. Signed-off-by: Arnd Bergmann Fixes: 48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function") Fixes: 15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients") --- drivers/dma/imx-sdma.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.9.0 diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 695f1603a224..7fb55ddf637b 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -670,11 +670,6 @@ static void sdma_event_disable(struct sdma_channel *sdmac, unsigned int event) writel_relaxed(val, sdma->regs + chnenbl); } -static void sdma_handle_channel_loop(struct sdma_channel *sdmac) -{ - dmaengine_desc_get_callback_invoke(&sdmac->desc, NULL); -} - static void sdma_update_channel_loop(struct sdma_channel *sdmac) { struct sdma_buffer_descriptor *bd;