From patchwork Fri Jan 8 10:59:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101199 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp479829lbb; Fri, 8 Jan 2016 03:00:50 -0800 (PST) X-Received: by 10.67.4.100 with SMTP id cd4mr85195380pad.59.1452250849990; Fri, 08 Jan 2016 03:00:49 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p80si4318881pfi.237.2016.01.08.03.00.49 for ; Fri, 08 Jan 2016 03:00:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-watchdog-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-watchdog-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-watchdog-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754310AbcAHLAt (ORCPT ); Fri, 8 Jan 2016 06:00:49 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:64971 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754496AbcAHLAs (ORCPT ); Fri, 8 Jan 2016 06:00:48 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue005) with ESMTPSA (Nemesis) id 0LlrOO-1Zi9wv1mW8-00ZQxe; Fri, 08 Jan 2016 11:59:37 +0100 From: Arnd Bergmann To: Wim Van Sebroeck , linux-watchdog@vger.kernel.org Cc: Oleksij Rempel , Guenter Roeck , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] watchdog: asm9260: remove __init and __exit annotations Date: Fri, 08 Jan 2016 11:59:34 +0100 Message-ID: <24150770.U3pBDPnky8@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:PTxaug2rAg7sDsC3tmfSXxQPCgpSw2i+BxDWwLpiHWIec3CJpaT z7nYAfr+hMk6bBfwlHAGYAr2C2IA/5pbld+npwsVN8JbHKDm4k/s/eNA9ejctdTfWKaYYby MLAZCc3AHkwVjiXOSUqyq0oZ3rrQwPwrMuiDB+ZS3FcRMEIZl/ESmcAO7jdq+K7XC1ZZRQL MZY03/U+H7bJigej0fjhw== X-UI-Out-Filterresults: notjunk:1; V01:K0:CVq1GY9xXHE=:zkKwCMgw9lEi7vsNNPBkUv 94iJXga+Vz9dVDvk4Irt+NLNe1v+pZeQjK6shPXb/mnw64Ls2FjO8WmLT3tHnmO+2tfgIUCmR jDDR8ckGg4TZR4YoFHVZAjPvmT0YSsBhxtxneXnMAercQA6UAhr5OYTeNam9OHnBVuBpVqR32 y3idMvGRednzpehGRck3yhsZ1y0v8/lrDOpEvtWkB3lgmTfhY6iou7apQA30Kvl/yNBE+D9l/ 1NeUFK18t3X8CvwvGXVlGpmwr1UngOYknTnazprgqQnqUXnVUL+Bb2BjLKxFisl1d3yayTgSO BvyqOOSuFzP8DHGt5DvBmKaNXaJRZnnvI2TJqq8cd2dBvUCbYjx6WFmTMDMo6xaaSuUK8BkVt NTVyfDH1RmKzJWXaM1OP/8p3OajBlNJBomr68BN4b2rVjp4xS5t4gVxbwQI+Mg628WyHboUl4 f3M1Fc9h8xS+quLqGo4U+HGDt3Ta+/yydvZwHlMOai+NMgzRGT/TN667UsQNG5ZohQImg3Ukf 0yYhGY+PJ9xn878JnhQU2jjKMVSWdebXjm8MbxwWhebkaGplW98GcDMQOCOXoP3+vJOC6tnZM O+H8r9L6okE2UiWjTmE4Hadd8YpjBBP0uGmmAVDeZxSQOODdcSRgy3e5rx5eDPy99/rc4Z2bq WK8cccSks7+0UXr7Z//d5INDp7RAN6YfYb550GeOOou3NZZJ29l9zdQfNt4o3qsH8aHbXS8rU ipzlw/wTg9bEYwWz Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org The probe and release functions in this driver are marked as __init and __exit, but this is wrong as indicated by this Kbuild error message: WARNING: vmlinux.o(.data+0x1d2308): Section mismatch in reference from the variable asm9260_wdt_driver to the function .init.text:asm9260_wdt_probe() This removes the annotations, to make the sysfs unbind attribute and deferred probing work. Signed-off-by: Arnd Bergmann Fixes: aae03dc98177 ("watchdog: add Alphascale asm9260-wdt driver") -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-by: Guenter Roeck diff --git a/drivers/watchdog/asm9260_wdt.c b/drivers/watchdog/asm9260_wdt.c index 1c22ff4c523a..c9686b2fdafd 100644 --- a/drivers/watchdog/asm9260_wdt.c +++ b/drivers/watchdog/asm9260_wdt.c @@ -198,7 +198,7 @@ static struct watchdog_ops asm9260_wdt_ops = { .set_timeout = asm9260_wdt_settimeout, }; -static int __init asm9260_wdt_get_dt_clks(struct asm9260_wdt_priv *priv) +static int asm9260_wdt_get_dt_clks(struct asm9260_wdt_priv *priv) { int err; unsigned long clk; @@ -250,7 +250,7 @@ static int __init asm9260_wdt_get_dt_clks(struct asm9260_wdt_priv *priv) return 0; } -static void __init asm9260_wdt_get_dt_mode(struct asm9260_wdt_priv *priv) +static void asm9260_wdt_get_dt_mode(struct asm9260_wdt_priv *priv) { const char *tmp; int ret; @@ -274,7 +274,7 @@ static void __init asm9260_wdt_get_dt_mode(struct asm9260_wdt_priv *priv) tmp); } -static int __init asm9260_wdt_probe(struct platform_device *pdev) +static int asm9260_wdt_probe(struct platform_device *pdev) { struct asm9260_wdt_priv *priv; struct watchdog_device *wdd; @@ -364,7 +364,7 @@ static void asm9260_wdt_shutdown(struct platform_device *pdev) asm9260_wdt_disable(&priv->wdd); } -static int __exit asm9260_wdt_remove(struct platform_device *pdev) +static int asm9260_wdt_remove(struct platform_device *pdev) { struct asm9260_wdt_priv *priv = platform_get_drvdata(pdev);