From patchwork Tue Nov 3 14:00:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7542591 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 11BB59F399 for ; Tue, 3 Nov 2015 14:01:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 367AA20695 for ; Tue, 3 Nov 2015 14:01:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 263CC205E8 for ; Tue, 3 Nov 2015 14:01:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751795AbbKCOBg (ORCPT ); Tue, 3 Nov 2015 09:01:36 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:51002 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019AbbKCOBf (ORCPT ); Tue, 3 Nov 2015 09:01:35 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue001) with ESMTPSA (Nemesis) id 0MGsGP-1Zgdic2ATJ-00Dbg2; Tue, 03 Nov 2015 15:00:59 +0100 From: Arnd Bergmann To: Vinod Koul , dmaengine@vger.kernel.org Cc: Dan Williams , linux-kernel@vger.kernel.org, Peter Ujfalusi , linux-arm-kernel@lists.infradead.org, Sekhar Nori , Kevin Hilman , linux-omap@vger.kernel.org Subject: [PATCH] dmaengine: edma: fix build without CONFIG_OF Date: Tue, 03 Nov 2015 15:00:57 +0100 Message-ID: <17811472.bY8CqmdEVy@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: V03:K0:NLFleLEjbQ+zEnSsRfc49/TGF/I+hJdNIrNBK2UrZvv57ZCtRaw s8WL4iWwaqOBHkifISTEHDfsAGuO6kRaCmxs/7yhCUsO8R7t6mfuzAoLKtzsY2JydfHrq11 IQUWYWQ2hD5lQUV9qBzcFSD0dXKB/Zyw6eHfEZ4pqiOVtiR4b0rYNY5T3tYgxIRYuWG0AGk 29RTv0eKFEUyFYJzXVc6g== X-UI-Out-Filterresults: notjunk:1; V01:K0:JJyb1OotxdY=:eEgY6ptEq5hnYoK+CLIFvx XVmrKd+Gl6ksyfW9FTl6sEK5uTrrMVC73fMnGb84WF8dKcP3xtT93/c7IibuB+nSrESyICfh5 ElHPkduR+nxlTWej9tHAWi5TsFgo0wBNJlQvFO8ozCfnZk97XSUxGVfPtMM5gAu0r/NLzBT3m 2YyX17Y/YKYG14wLt8mdhhLvjVoCpNNrrUTcCK5UF6rnPjf675hnCIsgyn7krPw72v0I04RZN RGXgV3ZXkrR6HcDcgf26I6w1o0E4sI3pt/iOtVUziaPeJLHlGFtSmaw1b66Xi40W+i4h42tMo SJTgBjwbswb5ycrSKE3Ezam8eH1OqtOPlwOAbjmko2fGBlp5vnpbmrlabO4Y1fTECfdsMOZxe B1Fc47eFNijaIKNswheS7MwTnq4fSgMXVNWVyVQk8uP77u2Sm/6E+sr7UTSZsKP9ihsxMgV43 Pm7R9CmUeFSyTi6s1odXoisUeRiuNXJDNzDtLEz8d6kAoCY0juCxF1jl1FLHNbQ32hjpqbDSq d1od48F90BgSK0Kh7kZVPg5O34yha0ga0hvOMnxw8+cgHeZPF0/XzKEKLJauHS5542hAoNAgi cpEafN7LSeMn8Wbab6QXepNBwjBURvBx9brr11uhlxwgBA3EDOH5PShvaW96wvjEnlQC2tGT5 yBm9+dnqsoFQ4Iu+wZZGxpmnzuOuzlDg1Kb2T0h7AU5SIVLyj1n+AvvDjyDROFKzNasrYcl88 5g8LNHkCcxmCJ0YR 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=unavailable 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 During the edma rework, a build error was introduced for the case that CONFIG_OF is disabled: drivers/built-in.o: In function `edma_tc_set_pm_state': :(.text+0x43bf0): undefined reference to `of_find_device_by_node' As the edma_tc_set_pm_state() function does nothing in case we are running without OF, this adds an IS_ENABLED() check that turns the function into an empty stub then and avoids the link error. Signed-off-by: Arnd Bergmann Fixes: ca304fa9bb76 ("ARM/dmaengine: edma: Public API to use private struct pointer") Acked-by: Peter Ujfalusi --- Found on ARM randconfig builds with today's linux-next -- 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/edma.c b/drivers/dma/edma.c index 31722d436a42..16713a93da10 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -1560,7 +1560,7 @@ static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable) struct platform_device *tc_pdev; int ret; - if (!tc) + if (!IS_ENABLED(CONFIG_OF) || !tc) return; tc_pdev = of_find_device_by_node(tc->node);