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

Commit 1334f329 authored by Axel Lin's avatar Axel Lin Committed by Wim Van Sebroeck
Browse files

watchdog: Use DEFINE_SPINLOCK() for static spinlocks 



Rather than just defining static spinlock_t variables and then
initializing them later in init functions, simply define them with
DEFINE_SPINLOCK() and remove the calls to spin_lock_init().

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Cc: Nicolas Thill <nico@openwrt.org>
Cc: Heiko Ronsdorf <hero@ihg.uni-duisburg.de>
Cc: Rodolfo Giometti <giometti@ascensit.com>
Cc: Andrey Panin <pazke@donpac.ru>
Cc: Guido Guenther <agx@sigxcpu.org>
Cc: Curt E Bruns <curt.e.bruns@intel.com>
Cc: Deepak Saxena <dsaxena@plexity.net>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: George G. Davis <gdavis@mvista.com>
Cc: Sylver Bruneau <sylver.bruneau@googlemail.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 216f3ad9

drivers/watchdog/ar7_wdt.c

+1 −3
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ struct ar7_wdt { 
};



static unsigned long wdt_is_open;

static spinlock_t wdt_lock;

static unsigned expect_close;

static DEFINE_SPINLOCK(wdt_lock);



/* XXX currently fixed, allows max margin ~68.72 secs */

#define prescale_value 0xffff
@@ -280,8 +280,6 @@ static int __devinit ar7_wdt_probe(struct platform_device *pdev) 
{

	int rc;



	spin_lock_init(&wdt_lock);



	ar7_regs_wdt =

		platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");

	if (!ar7_regs_wdt) {

drivers/watchdog/cpu5wdt.c

+1 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
static int verbose;

static int port = 0x91;

static int ticks = 10000;

static spinlock_t cpu5wdt_lock;

static DEFINE_SPINLOCK(cpu5wdt_lock);



#define PFX			"cpu5wdt: "
@@ -223,7 +223,6 @@ static int __devinit cpu5wdt_init(void) 
				"port=0x%x, verbose=%i\n", port, verbose);



	init_completion(&cpu5wdt_device.stop);

	spin_lock_init(&cpu5wdt_lock);

	cpu5wdt_device.queue = 0;

	setup_timer(&cpu5wdt_device.timer, cpu5wdt_trigger, 0);

	cpu5wdt_device.default_ticks = ticks;

drivers/watchdog/eurotechwdt.c

+1 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
static unsigned long eurwdt_is_open;

static int eurwdt_timeout;

static char eur_expect_close;

static spinlock_t eurwdt_lock;

static DEFINE_SPINLOCK(eurwdt_lock);



/*

 * You must set these - there is no sane way to probe for this board.
@@ -446,8 +446,6 @@ static int __init eurwdt_init(void) 
		goto outreg;

	}



	spin_lock_init(&eurwdt_lock);



	ret = misc_register(&eurwdt_miscdev);

	if (ret) {

		printk(KERN_ERR "eurwdt: can't misc_register on minor=%d\n",

drivers/watchdog/ibmasr.c

+1 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static char asr_expect_close; 
static unsigned int asr_type, asr_base, asr_length;

static unsigned int asr_read_addr, asr_write_addr;

static unsigned char asr_toggle_mask, asr_disable_mask;

static spinlock_t asr_lock;

static DEFINE_SPINLOCK(asr_lock);



static void __asr_toggle(void)

{
@@ -386,8 +386,6 @@ static int __init ibmasr_init(void) 
	if (!asr_type)

		return -ENODEV;



	spin_lock_init(&asr_lock);



	rc = asr_get_base_address();

	if (rc)

		return rc;

drivers/watchdog/indydog.c

+1 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


#define PFX "indydog: "

static unsigned long indydog_alive;

static spinlock_t indydog_lock;

static DEFINE_SPINLOCK(indydog_lock);



#define WATCHDOG_TIMEOUT 30		/* 30 sec default timeout */
@@ -185,8 +185,6 @@ static int __init watchdog_init(void) 
{

	int ret;



	spin_lock_init(&indydog_lock);



	ret = register_reboot_notifier(&indydog_notifier);

	if (ret) {

		printk(KERN_ERR PFX