From patchwork Fri Sep 26 21:24:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4987821 Return-Path: X-Original-To: patchwork-dmaengine@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 8B4B1BEEA6 for ; Fri, 26 Sep 2014 21:24:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E74B2021F for ; Fri, 26 Sep 2014 21:24:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C6C722021B for ; Fri, 26 Sep 2014 21:24:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030184AbaIZVYK (ORCPT ); Fri, 26 Sep 2014 17:24:10 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:53964 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755763AbaIZVYJ (ORCPT ); Fri, 26 Sep 2014 17:24:09 -0400 Received: from wuerfel.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue001) with ESMTP (Nemesis) id 0MUQni-1XgwdN1sdW-00R23C; Fri, 26 Sep 2014 23:24:03 +0200 From: Arnd Bergmann To: Vinod Koul Cc: linux-arm-kernel@lists.infradead.org, Mark Brown , Dan Williams , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dma: imx-sdma: fix another incorrect __init annotation Date: Fri, 26 Sep 2014 23:24 +0200 Message-ID: <38530464.3ymIRX74DK@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:sdGCD2BhDn9RZe2SCg9BaS667ME6vdYn2P39GwXZVgi 1TqQ5Te8UQw9D9piwHWLmtWQ+IGBBGTlKU31iRulxSyCFYqwph zJtq07prBEEx9K+/7DLuYAfpj1NN6Lp4SDIhabIWTlz/Q0i6ud u6buvkzzpbJ8vphov3v2Xn2t7tyA/v4MpsYOHUuqN6NhGwE1XK l08qf8atcOLuGFO0Wv6S/c/3cpbvevylAbGQQ1IwFOKqmTDdxh SaCXa+QMaL6TLJO4sWDl5qOHmrCKUqVDohol34MPmsWNMHS1/o 1vJlzmU2tS3FCfNC7sFKAW5CkMvkiJJh2mihx6WHnGJIIdzHf6 VAjoEST4wyGMKEwK64G8= 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=-7.6 required=5.0 tests=BAYES_00, 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 In e34b731faa7d1 ("dma: imx-sdma: Remove spurious __init annotation on sdma_probe()"), Mark found an extraneous __init label and fixed it. However, he missed another one, because now we get this other warning: WARNING: drivers/dma/imx-sdma.o(.text+0x3bb4): Section mismatch in reference from the function sdma_probe() to the function .init.text:sdma_get_firmware() The function sdma_probe() references the function __init sdma_get_firmware(). Same reasoning as the last time, the function may get called at runtime, so it can't be __init. Signed-off-by: Arnd Bergmann --- 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/imx-sdma.c b/drivers/dma/imx-sdma.c index 52ce1d21154c..88afc48c2ca7 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1334,7 +1334,7 @@ err_firmware: release_firmware(fw); } -static int __init sdma_get_firmware(struct sdma_engine *sdma, +static int sdma_get_firmware(struct sdma_engine *sdma, const char *fw_name) { int ret;