From patchwork Sun May 1 22:44:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Breathitt Gray X-Patchwork-Id: 617297 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qyjDL4jn9z9t5C for ; Mon, 2 May 2016 08:44:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Lcc4GXBg; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752470AbcEAWoe (ORCPT ); Sun, 1 May 2016 18:44:34 -0400 Received: from mail-yw0-f175.google.com ([209.85.161.175]:36516 "EHLO mail-yw0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752367AbcEAWod (ORCPT ); Sun, 1 May 2016 18:44:33 -0400 Received: by mail-yw0-f175.google.com with SMTP id o66so254775319ywc.3; Sun, 01 May 2016 15:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=I4/bN8aXDF8UXspU4XIzix0R0wKfuWRFHrFmtB/WCtI=; b=Lcc4GXBgat1DRlyQbxD4w0eQGOTmy+xgyRO2KcPkTqPeS4RZpd1S8U+GfOPHoqZW95 sWEkYY4MWUkG+OakKuv4BKVhorNVTECenGwKkObybU++GIBUPOIIFCtUWi9f9Ivo8f68 LQImzFSO9g4VHsvXqnFuWuR/VWDCrmY39gn+1xcnTu9/Q16gEX7yXgEpxy94T7AEX8Te H65nKFtU0VswmjtFIU3ChiEWeCWG65K2f/9+lulOwg9mu43V91eA6jVtl44c7FKZZ1/j CL8GsBMwRE4pbsKybQEwsNeg3ZInWZxT8uCr4bMYuTrXu4eH7DA1OOEIT6zwnrec1VxO 2IoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=I4/bN8aXDF8UXspU4XIzix0R0wKfuWRFHrFmtB/WCtI=; b=NtYdLy80ZBvph+5GLsLYetrVx8qvLzNjK5hUJFbaXQcfLmF+N3Vj3unk7eE3rYVPQK eJYo3wKFiIsfkEGTpf4gh+EXwdQ8Uow0MqehU7F7SXiGcnIyHoVJCMlP875zML/zyLCo PNEWKxZHjsbRGdzFHA0WHJVpzSXiVeqo/l0tExlCxrNipgA/1yyfTjcLaVH+ZdpewGvU kW16bNkWp26NDzMkHxjIduH72e8zd8IeK40dNSEhlDmaQapOcXmDkGYABwxfhq2GPPAo FhQB7OQ6mEIWKtkwuzOLBhJ9wnndxLuFPHRUmOLVIz3wUdQAJd1s1zFZh/1WEW6+kjf9 QeAg== X-Gm-Message-State: AOPr4FXlLrk/03j3VE0PGgaJKKj9KViOW/+MWdiQNf4kyD6lrgnIXkcSb3b2V6nLRGVgOw== X-Received: by 10.13.239.2 with SMTP id y2mr19153116ywe.22.1462142672146; Sun, 01 May 2016 15:44:32 -0700 (PDT) Received: from localhost (71-47-58-73.res.bhn.net. [71.47.58.73]) by smtp.gmail.com with ESMTPSA id b126sm13844236ywd.3.2016.05.01.15.44.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 May 2016 15:44:31 -0700 (PDT) From: William Breathitt Gray To: gregkh@linuxfoundation.org Cc: linux-iio@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-gpio@vger.kernel.org, William Breathitt Gray , Wim Van Sebroeck Subject: [PATCH v2 06/10] watchdog: ebc-c384_wdt: Utilize the ISA bus driver Date: Sun, 1 May 2016 18:44:26 -0400 Message-Id: <3a5ce818956330cdfe297722ac2d4ce6d3ad5f48.1462141338.git.vilhelm.gray@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: References: Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The WinSystems EBC-C384 watchdog timer is controlled via ISA bus communication. As such, the ISA bus driver is more appropriate than the platform driver for the WinSystems EBC-C384 watchdog timer driver. Cc: Wim Van Sebroeck Acked-by: Guenter Roeck Signed-off-by: William Breathitt Gray --- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/ebc-c384_wdt.c | 43 ++++++++++------------------------------- 2 files changed, 11 insertions(+), 34 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index fb94765..0aefe25 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -738,7 +738,7 @@ config ALIM7101_WDT config EBC_C384_WDT tristate "WinSystems EBC-C384 Watchdog Timer" - depends on X86 + depends on X86 && ISA select WATCHDOG_CORE help Enables watchdog timer support for the watchdog timer on the diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c index 77fda0b..4b849b8 100644 --- a/drivers/watchdog/ebc-c384_wdt.c +++ b/drivers/watchdog/ebc-c384_wdt.c @@ -16,10 +16,10 @@ #include #include #include +#include #include #include #include -#include #include #include @@ -95,9 +95,8 @@ static const struct watchdog_info ebc_c384_wdt_info = { .identity = MODULE_NAME }; -static int __init ebc_c384_wdt_probe(struct platform_device *pdev) +static int ebc_c384_wdt_probe(struct device *dev, unsigned int id) { - struct device *dev = &pdev->dev; struct watchdog_device *wdd; if (!devm_request_region(dev, BASE_ADDR, ADDR_EXTENT, dev_name(dev))) { @@ -122,61 +121,39 @@ static int __init ebc_c384_wdt_probe(struct platform_device *pdev) dev_warn(dev, "Invalid timeout (%u seconds), using default (%u seconds)\n", timeout, WATCHDOG_TIMEOUT); - platform_set_drvdata(pdev, wdd); + dev_set_drvdata(dev, wdd); return watchdog_register_device(wdd); } -static int ebc_c384_wdt_remove(struct platform_device *pdev) +static int ebc_c384_wdt_remove(struct device *dev, unsigned int id) { - struct watchdog_device *wdd = platform_get_drvdata(pdev); + struct watchdog_device *wdd = dev_get_drvdata(dev); watchdog_unregister_device(wdd); return 0; } -static struct platform_driver ebc_c384_wdt_driver = { +static struct isa_driver ebc_c384_wdt_driver = { + .probe = ebc_c384_wdt_probe, .driver = { .name = MODULE_NAME }, .remove = ebc_c384_wdt_remove }; -static struct platform_device *ebc_c384_wdt_device; - static int __init ebc_c384_wdt_init(void) { - int err; - if (!dmi_match(DMI_BOARD_NAME, "EBC-C384 SBC")) return -ENODEV; - ebc_c384_wdt_device = platform_device_alloc(MODULE_NAME, -1); - if (!ebc_c384_wdt_device) - return -ENOMEM; - - err = platform_device_add(ebc_c384_wdt_device); - if (err) - goto err_platform_device; - - err = platform_driver_probe(&ebc_c384_wdt_driver, ebc_c384_wdt_probe); - if (err) - goto err_platform_driver; - - return 0; - -err_platform_driver: - platform_device_del(ebc_c384_wdt_device); -err_platform_device: - platform_device_put(ebc_c384_wdt_device); - return err; + return isa_register_driver(&ebc_c384_wdt_driver, 1); } static void __exit ebc_c384_wdt_exit(void) { - platform_device_unregister(ebc_c384_wdt_device); - platform_driver_unregister(&ebc_c384_wdt_driver); + isa_unregister_driver(&ebc_c384_wdt_driver); } module_init(ebc_c384_wdt_init); @@ -185,4 +162,4 @@ module_exit(ebc_c384_wdt_exit); MODULE_AUTHOR("William Breathitt Gray "); MODULE_DESCRIPTION("WinSystems EBC-C384 watchdog timer driver"); MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("platform:" MODULE_NAME); +MODULE_ALIAS("isa:" MODULE_NAME);