summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/ibmasr.c
diff options
context:
space:
mode:
authorAxel Lin2011-11-29 06:54:01 +0100
committerWim Van Sebroeck2012-01-06 15:17:17 +0100
commit1334f32938e46fb321c67a652997d33583257249 (patch)
treef296005ef79641ea4733af19cda0f5bf736824b1 /drivers/watchdog/ibmasr.c
parentwatchdog: Convert Wolfson drivers to module_platform_driver (diff)
downloadkernel-qcow2-linux-1334f32938e46fb321c67a652997d33583257249.tar.gz
kernel-qcow2-linux-1334f32938e46fb321c67a652997d33583257249.tar.xz
kernel-qcow2-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/ibmasr.c')
-rw-r--r--drivers/watchdog/ibmasr.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
index 195e0f798e76..c7481ad51629 100644
--- a/drivers/watchdog/ibmasr.c
+++ b/drivers/watchdog/ibmasr.c
@@ -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;