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

Commit bec4f749 authored by Thomas Koeller's avatar Thomas Koeller Committed by Wim Van Sebroeck
Browse files

[WATCHDOG] rm9k_wdt: fix compilation 



Driver did not compile any more. Someone moved the definition
of 'struct miscdevice miscdev' to a place near the end of the
file, after some code that was refering to this variable.

Signed-off-by: default avatarThomas Koeller <thomas.koeller@baslerweb.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 68380b58

drivers/char/watchdog/rm9k_wdt.c

+20 −20
Original line number Diff line number Diff line
@@ -94,6 +94,26 @@ module_param(nowayout, bool, 0444); 
MODULE_PARM_DESC(nowayout, "Watchdog cannot be disabled once started");





/* Kernel interfaces */

static struct file_operations fops = {

	.owner		= THIS_MODULE,

	.open		= wdt_gpi_open,

	.release	= wdt_gpi_release,

	.write		= wdt_gpi_write,

	.unlocked_ioctl	= wdt_gpi_ioctl,

};



static struct miscdevice miscdev = {

	.minor		= WATCHDOG_MINOR,

	.name		= wdt_gpi_name,

	.fops		= &fops,

};



static struct notifier_block wdt_gpi_shutdown = {

	.notifier_call	= wdt_gpi_notify,

};





/* Interrupt handler */

static irqreturn_t wdt_gpi_irqhdl(int irq, void *ctxt, struct pt_regs *regs)

{
@@ -312,26 +332,6 @@ wdt_gpi_notify(struct notifier_block *this, unsigned long code, void *unused) 
}





/* Kernel interfaces */

static struct file_operations fops = {

	.owner		= THIS_MODULE,

	.open		= wdt_gpi_open,

	.release	= wdt_gpi_release,

	.write		= wdt_gpi_write,

	.unlocked_ioctl	= wdt_gpi_ioctl,

};



static struct miscdevice miscdev = {

	.minor		= WATCHDOG_MINOR,

	.name		= wdt_gpi_name,

	.fops		= &fops,

};



static struct notifier_block wdt_gpi_shutdown = {

	.notifier_call	= wdt_gpi_notify,

};





/* Init & exit procedures */

static const struct resource *

wdt_gpi_get_resource(struct platform_device *pdv, const char *name,