[WATCHDOG] small trivial fixes + add .owner to driver struct's

From: Wim Van Sebroeck
Date: Sun Oct 23 2005 - 13:07:06 EST


Hi Linus,

please do a

git pull rsync://rsync.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git

This will update the following files:

drivers/char/watchdog/mpcore_wdt.c | 1 +
drivers/char/watchdog/mv64x60_wdt.c | 1 +
drivers/char/watchdog/pcwd_pci.c | 7 +++++--
drivers/char/watchdog/s3c2410_wdt.c | 1 +
drivers/char/watchdog/w83627hf_wdt.c | 2 +-
drivers/char/watchdog/wdt_pci.c | 1 +
6 files changed, 10 insertions(+), 3 deletions(-)

with these Changes:

Author: Wim Van Sebroeck <wim@xxxxxxxxx>
Date: Sun Oct 23 15:21:44 2005 +0200

[WATCHDOG] adds device_driver .owner field

Initialise the .owner field of the device driver
with the module that owns it, for easier tracking
of device driver ownership. (probably also better
for sysfs...)

Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

Author: Laurent Riffard <laurent.riffard@xxxxxxx>
Date: Sat Oct 22 21:41:26 2005 +0200

[WATCHDOG] updates .owner field of struct pci_driver

This patch updates .owner field of struct pci_driver.
This allows SYSFS to create the symlink from the driver to the
module which provides it.

Signed-off-by: Laurent Riffard <laurent.riffard@xxxxxxx>
Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

Author: Wim Van Sebroeck <wim@xxxxxxxxx>
Date: Sat Oct 22 16:27:19 2005 +0200

[WATCHDOG] pcwd_pci.c update comments

update copyright + update bells and whistles driver for v2.6

Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

Author: Pozsar Balazs <pozsy@xxxxxxxxxxx>
Date: Fri Oct 21 10:52:01 2005 +0100

[WATCHDOG] w83627hf_wdt trivial typo

The most trivial typo fix in the world.

Signed-off-by: Pozsar Balazs <pozsy@xxxxxxxxxxx>
Signed-off-by: Pádraig Brady <P@xxxxxxxxxxxxxx>
Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

Author: Ben Dooks <ben-linux@xxxxxxxxx>
Date: Mon Oct 10 01:28:30 2005 +0100

[WATCHDOG] s3c2410 wdt - add .owner field

Initialise the .owner field of the device driver
with the module that owns it, for easier tracking
of device driver ownership.

Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx>
Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>


The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary

For completeness, I added the overal diff below.

Greetings,
Wim.

================================================================================
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
--- a/drivers/char/watchdog/mpcore_wdt.c
+++ b/drivers/char/watchdog/mpcore_wdt.c
@@ -396,6 +396,7 @@ static int __devexit mpcore_wdt_remove(s
}

static struct device_driver mpcore_wdt_driver = {
+ .owner = THIS_MODULE,
.name = "mpcore_wdt",
.bus = &platform_bus_type,
.probe = mpcore_wdt_probe,
diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c
--- a/drivers/char/watchdog/mv64x60_wdt.c
+++ b/drivers/char/watchdog/mv64x60_wdt.c
@@ -211,6 +211,7 @@ static int __devexit mv64x60_wdt_remove(
}

static struct device_driver mv64x60_wdt_driver = {
+ .owner = THIS_MODULE,
.name = MV64x60_WDT_NAME,
.bus = &platform_bus_type,
.probe = mv64x60_wdt_probe,
diff --git a/drivers/char/watchdog/pcwd_pci.c b/drivers/char/watchdog/pcwd_pci.c
--- a/drivers/char/watchdog/pcwd_pci.c
+++ b/drivers/char/watchdog/pcwd_pci.c
@@ -1,7 +1,7 @@
/*
* Berkshire PCI-PC Watchdog Card Driver
*
- * (c) Copyright 2003 Wim Van Sebroeck <wim@xxxxxxxxx>.
+ * (c) Copyright 2003-2005 Wim Van Sebroeck <wim@xxxxxxxxx>.
*
* Based on source code of the following authors:
* Ken Hollis <kenji@xxxxxxxxxxx>,
@@ -21,7 +21,9 @@
*/

/*
- * A bells and whistles driver is available from http://www.pcwd.de/
+ * A bells and whistles driver is available from:
+ * http://www.kernel.org/pub/linux/kernel/people/wim/pcwd/pcwd_pci/
+ *
* More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/
*/

@@ -753,6 +755,7 @@ static struct pci_device_id pcipcwd_pci_
MODULE_DEVICE_TABLE(pci, pcipcwd_pci_tbl);

static struct pci_driver pcipcwd_driver = {
+ .owner = THIS_MODULE,
.name = WATCHDOG_NAME,
.id_table = pcipcwd_pci_tbl,
.probe = pcipcwd_card_init,
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -501,6 +501,7 @@ static int s3c2410wdt_resume(struct devi


static struct device_driver s3c2410wdt_driver = {
+ .owner = THIS_MODULE,
.name = "s3c2410-wdt",
.bus = &platform_bus_type,
.probe = s3c2410wdt_probe,
diff --git a/drivers/char/watchdog/w83627hf_wdt.c b/drivers/char/watchdog/w83627hf_wdt.c
--- a/drivers/char/watchdog/w83627hf_wdt.c
+++ b/drivers/char/watchdog/w83627hf_wdt.c
@@ -359,5 +359,5 @@ module_exit(wdt_exit);

MODULE_LICENSE("GPL");
MODULE_AUTHOR("Pádraig Brady <P@xxxxxxxxxxxxxx>");
-MODULE_DESCRIPTION("w38627hf WDT driver");
+MODULE_DESCRIPTION("w83627hf WDT driver");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/wdt_pci.c b/drivers/char/watchdog/wdt_pci.c
--- a/drivers/char/watchdog/wdt_pci.c
+++ b/drivers/char/watchdog/wdt_pci.c
@@ -711,6 +711,7 @@ MODULE_DEVICE_TABLE(pci, wdtpci_pci_tbl)


static struct pci_driver wdtpci_driver = {
+ .owner = THIS_MODULE,
.name = "wdt_pci",
.id_table = wdtpci_pci_tbl,
.probe = wdtpci_init_one,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/