From patchwork Thu Oct 8 21:34:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Rochet X-Patchwork-Id: 7355431 Return-Path: X-Original-To: patchwork-linux-arm@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 A79F09F4DC for ; Thu, 8 Oct 2015 21:37:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF56A2051F for ; Thu, 8 Oct 2015 21:37:15 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF8A92078B for ; Thu, 8 Oct 2015 21:37:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZkIqv-0008Q9-HV; Thu, 08 Oct 2015 21:35:53 +0000 Received: from mx-guillaumet.finsecur.com ([91.217.234.131] helo=guillaumet.finsecur.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZkIqB-0006pl-76 for linux-arm-kernel@lists.infradead.org; Thu, 08 Oct 2015 21:35:09 +0000 Received: from [172.16.8.13] (helo=spice.lan) by guillaumet.finsecur.com with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZkIpk-0005RU-Pg; Thu, 08 Oct 2015 23:34:41 +0200 Received: from gradator by spice.lan with local (Exim 4.86) (envelope-from ) id 1ZkIpk-00047A-Lr; Thu, 08 Oct 2015 23:34:40 +0200 From: Sylvain Rochet To: Guenter Roeck , Boris BREZILLON , linux-kernel@vger.kernel.org, Nicolas Ferre , Ludovic Desroches , linux-arm-kernel@lists.infradead.org, Alexandre Belloni , Wenyou Yang , Wim Van Sebroeck Date: Thu, 8 Oct 2015 23:34:33 +0200 Message-Id: <1444340074-15437-6-git-send-email-sylvain.rochet@finsecur.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1444340074-15437-1-git-send-email-sylvain.rochet@finsecur.com> References: <1444340074-15437-1-git-send-email-sylvain.rochet@finsecur.com> X-SA-Exim-Connect-IP: 172.16.8.13 X-SA-Exim-Mail-From: sylvain.rochet@finsecur.com X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Subject: [PATCH 5/6] watchdog: at91sam9: remove unused pdata support X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on guillaumet.finsecur.com) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151008_143507_518873_4C98C824 X-CRM114-Status: GOOD ( 11.42 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sylvain Rochet MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP All SoC using this driver were converted to device tree. Remove pdata support and initialization steps which are only used for pdata. Signed-off-by: Sylvain Rochet --- drivers/watchdog/at91sam9_wdt.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 8629f48..5d3e8c0 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -62,9 +62,6 @@ /* Watchdog max delta/value in secs */ #define WDT_COUNTER_MAX_SECS ticks_to_secs(WDT_COUNTER_MAX_TICKS) -/* Hardware timeout in seconds */ -#define WDT_HW_TIMEOUT 16 - /* User land default timeout */ #define WDT_DEFAULT_TIMEOUT 15 @@ -261,7 +258,6 @@ static const struct watchdog_ops at91_wdt_ops = { .set_timeout = at91_wdt_set_timeout, }; -#if defined(CONFIG_OF) static int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt) { u32 min = 0; @@ -317,12 +313,6 @@ static int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt) return 0; } -#else -static inline int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt) -{ - return 0; -} -#endif static int __init at91wdt_probe(struct platform_device *pdev) { @@ -334,9 +324,6 @@ static int __init at91wdt_probe(struct platform_device *pdev) if (!wdt) return -ENOMEM; - wdt->mr = (WDT_HW_TIMEOUT * 256) | AT91_WDT_WDRSTEN | AT91_WDT_WDD | - AT91_WDT_WDDBGHLT; - wdt->mr_mask = 0x3FFFFFFF; wdt->wdd.parent = &pdev->dev; wdt->wdd.info = &at91_wdt_info; wdt->wdd.ops = &at91_wdt_ops; @@ -396,14 +383,12 @@ static int __exit at91wdt_remove(struct platform_device *pdev) return 0; } -#if defined(CONFIG_OF) static const struct of_device_id at91_wdt_dt_ids[] = { { .compatible = "atmel,at91sam9260-wdt" }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); -#endif static struct platform_driver at91wdt_driver = { .remove = __exit_p(at91wdt_remove),