From patchwork Tue Oct 9 20:13:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1571441 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 98121DFFAD for ; Tue, 9 Oct 2012 20:16:30 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TLgBx-0008OE-EW; Tue, 09 Oct 2012 20:14:13 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TLgBs-0008N7-9Z for linux-arm-kernel@lists.infradead.org; Tue, 09 Oct 2012 20:14:09 +0000 Received: from klappe2.lan (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LiJxI-1TvqLq14Ie-00ceTs; Tue, 09 Oct 2012 22:14:06 +0200 From: Arnd Bergmann To: arm@kernel.org Subject: [PATCH v2 7/8] video: mark nuc900fb_map_video_memory as __devinit Date: Tue, 9 Oct 2012 22:13:57 +0200 Message-Id: <1349813638-4617-8-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349813638-4617-1-git-send-email-arnd@arndb.de> References: <1349813638-4617-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:qBSgkGYFMYa4dOCRVCzrF6MsyECZcuEcVvfF7NJVVLk 5x1HyT4Hk3+Sfg8rC16qF9zPDULqK267ZDRGgJ/xtdT5JTWdnw w5NsArf/pu6NABsXK558qI8js3LRNrHaGgKkV6yhCC5yEXSU1e bZk08admbd4o6jq80/T6pVv1rlQoG6Mc4gH223eeFh65iGSt0H xh0bi2Pq4tQw5Xmkh4v+Uo5vweh94hjig5zKTIjGpLEUO6We1N t4JcMu1lx4QhH8lQOaD+ypethPt1fNEjOKp5jljKNskSjDUJTM VBRYiyxINrjauSMlWMk/UUI+16Q/IuXRMjjI3AoYwQ8FD8K6Qb laezmARzsH+IvE3zc2zazPuJClfJjTpI0xngAEOu8 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-fbdev@vger.kernel.org, Arnd Bergmann , Wan ZongShun , Florian Tobias Schandinat , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org nuc900fb_map_video_memory is called by an devinit function that may be called at run-time, but the function itself is marked __init and will be discarded after boot. To avoid calling into a function that may have been overwritten, mark nuc900fb_map_video_memory itself as __devinit. Without this patch, building nuc950_defconfig results in: WARNING: drivers/video/built-in.o(.devinit.text+0x26c): Section mismatch in reference from the function nuc900fb_probe() to the function .init.text:nuc900fb_map_video_memory() The function __devinit nuc900fb_probe() references a function __init nuc900fb_map_video_memory(). If nuc900fb_map_video_memory is only used by nuc900fb_probe then annotate nuc900fb_map_video_memory with a matching annotation. Signed-off-by: Arnd Bergmann Cc: Wan ZongShun Cc: Florian Tobias Schandinat Cc: linux-fbdev@vger.kernel.org Acked-by: Wan ZongShun --- drivers/video/nuc900fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c index e10f551..b31b12b 100644 --- a/drivers/video/nuc900fb.c +++ b/drivers/video/nuc900fb.c @@ -387,7 +387,7 @@ static int nuc900fb_init_registers(struct fb_info *info) * The buffer should be a non-cached, non-buffered, memory region * to allow palette and pixel writes without flushing the cache. */ -static int __init nuc900fb_map_video_memory(struct fb_info *info) +static int __devinit nuc900fb_map_video_memory(struct fb_info *info) { struct nuc900fb_info *fbi = info->par; dma_addr_t map_dma;