summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/ar7_wdt.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-11-29 06:54:01 +0100
committerWim Van Sebroeck <wim@iguana.be>2012-01-06 15:17:17 +0100
commit1334f32938e46fb321c67a652997d33583257249 (patch)
treef296005ef79641ea4733af19cda0f5bf736824b1 /drivers/watchdog/ar7_wdt.c
parentwatchdog: Convert Wolfson drivers to module_platform_driver (diff)
downloadlinux-1334f32938e46fb321c67a652997d33583257249.tar.xz
linux-1334f32938e46fb321c67a652997d33583257249.zip
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: Axel 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: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/ar7_wdt.c')
-rw-r--r--drivers/watchdog/ar7_wdt.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
index b29221783598..b9564c5ddab9 100644
--- a/drivers/watchdog/ar7_wdt.c
+++ b/drivers/watchdog/ar7_wdt.c
@@ -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) {