Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ef1bec4 authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Greg Kroah-Hartman
Browse files

watchdog: ebc-c384_wdt: Utilize the ISA bus driver



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 <wim@iguana.be>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c2cfc19
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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
+10 −33
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/isa.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/platform_device.h>
#include <linux/types.h>
#include <linux/watchdog.h>

@@ -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 <vilhelm.gray@gmail.com>");
MODULE_DESCRIPTION("WinSystems EBC-C384 watchdog timer driver");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:" MODULE_NAME);
MODULE_ALIAS("isa:" MODULE_NAME);