[PATCH] Lock initializer cleanup: Block devices

Use the new lock initializers DEFINE_SPIN_LOCK and DEFINE_RW_LOCK

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index a2caf824bb2e03438f56c36a051a892889f90622..ce933de4808494445996ee5c161f8dbca576222e 100644 (file)
--- a/drivers/block/acsi.c
+++ b/drivers/block/acsi.c
@@ -250,7 +250,7 @@ static int                          CurrentNReq;
 static int                             CurrentNSect;
 static char                            *CurrentBuffer;
 
-static spinlock_t                      acsi_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(acsi_lock);
 
 
 #define SET_TIMER()    mod_timer(&acsi_timer, jiffies + ACSI_TIMEOUT)

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 19ca2e57e9afa4f22d102b66ab82ca449f4d482a..1468e8cf712d501ec69ca8aea740e8567776b50d 100644 (file)
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -163,7 +163,7 @@ static int writepending;
 static int writefromint;
 static char *raw_buf;
 
-static spinlock_t amiflop_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(amiflop_lock);
 
 #define RAW_BUF_SIZE 30000  /* size of raw disk data */
 

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index c5385258da8851710bbfe90cb154444031be2ef4..db05a5a99f354537ce3bd69de48e8a84a3cd14dd 100644 (file)
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -140,7 +140,7 @@ static int StartDiskType[] = {
 
 static int DriveType = TYPE_HD;
 
-static spinlock_t ataflop_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(ataflop_lock);
 
 /* Array for translating minors into disk formats */
 static struct {

diff --git a/drivers/block/elevator.c b/drivers/block/elevator.c
index 0bf9458f911dfaee5fcea4f9e5d953fa97431c4e..35f4079b04d66c539d00396225f918cbd79c5030 100644 (file)
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
@@ -37,7 +37,7 @@
 
 #include <asm/uaccess.h>
 
-static spinlock_t elv_list_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(elv_list_lock);
 static LIST_HEAD(elv_list);
 
 /*

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index b080ad722d2032cd026b07b5a1c0316a097188b7..bce3fc0e6e4f32b252c1b24319406619a19bf8aa 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -216,7 +216,7 @@ static int use_virtual_dma;
  * record each buffers capabilities
  */
 
-static spinlock_t floppy_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(floppy_lock);
 static struct completion device_release;
 
 static unsigned short virtual_dma_port = 0x3f0;
@@ -1072,7 +1072,7 @@ static int fd_wait_for_completion(unsigned long delay, timeout_fn function)
        return 0;
 }
 
-static spinlock_t floppy_hlt_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(floppy_hlt_lock);
 static int hlt_disabled;
 static void floppy_disable_hlt(void)
 {
@@ -4415,7 +4415,7 @@ out_put_disk:
        return err;
 }
 
-static spinlock_t floppy_usage_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(floppy_usage_lock);
 
 static int floppy_grab_irq_and_dma(void)
 {

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 775b8ae21ccdbc3a351abb5f311126d25f281104..2f5cc3e251c605f34d72d95824caece8294c8037 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -92,7 +92,7 @@ static struct nbd_device nbd_dev[MAX_NBD];
  *    a single lock.
  * Thanks go to Jens Axboe and Al Viro for their LKML emails explaining this!
  */
-static spinlock_t nbd_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(nbd_lock);
 
 #ifndef NDEBUG
 static const char *ioctl_cmd_to_ascii(int cmd)

diff --git a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c
index 8d29459a143439e17a0a2ddfeda487c8f0b1c19b..1fef136c0e412a53538d6e0833eece3df2822b84 100644 (file)
--- a/drivers/block/paride/paride.c
+++ b/drivers/block/paride/paride.c
@@ -46,7 +46,7 @@ MODULE_LICENSE("GPL");
 
 static struct pi_protocol *protocols[MAX_PROTOS];
 
-static spinlock_t pi_spinlock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pi_spinlock);
 
 void pi_write_regr(PIA * pi, int cont, int regr, int val)
 {

diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index c4c8f0df59eecc85454762291189d85f8564e72d..4390587b34132abf345178c2d55cc769a4162e8b 100644 (file)
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -155,7 +155,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV};
 #include <linux/sched.h>
 #include <linux/workqueue.h>
 
-static spinlock_t pd_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pd_lock);
 
 #ifndef MODULE
 

diff --git a/drivers/block/paride/pseudo.h b/drivers/block/paride/pseudo.h
index d9818ec320e6f699cebfe8a7f098168f4508703a..932342d7a8ebdfbb3d329e04b2f040f868357c82 100644 (file)
--- a/drivers/block/paride/pseudo.h
+++ b/drivers/block/paride/pseudo.h
@@ -43,7 +43,7 @@ static unsigned long ps_timeout;
 static int ps_tq_active = 0;
 static int ps_nice = 0;
 
-static spinlock_t ps_spinlock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(ps_spinlock __attribute__((unused)));
 
 static DECLARE_WORK(ps_tq, ps_tq_int, NULL);
 

diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
index 84f4e62765e48500ece3a6d069f87e449dc6331b..29548784cb7b1ab734c65e68897867a7c992523e 100644 (file)
--- a/drivers/block/ps2esdi.c
+++ b/drivers/block/ps2esdi.c
@@ -108,7 +108,7 @@ static int intg_esdi = 0;       /* If integrated adapter */
 struct ps2esdi_i_struct {
        unsigned int head, sect, cyl, wpcom, lzone, ctl;
 };
-static spinlock_t ps2esdi_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(ps2esdi_lock);
 static struct request_queue *ps2esdi_queue;
 static struct request *current_req;
 

diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 375bf724333c7606213e05e71f48ed4ae2ac2c8f..5b09cf154ac7f3d9f29e1569952f53bebdd2cb71 100644 (file)
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -206,7 +206,7 @@ struct floppy_state {
 
 static struct floppy_state floppy_states[MAX_FLOPPIES];
 static int floppy_count = 0;
-static spinlock_t swim3_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(swim3_lock);
 
 static unsigned short write_preamble[] = {
        0x4e4e, 0x4e4e, 0x4e4e, 0x4e4e, 0x4e4e, /* gap field */

diff --git a/drivers/block/swim_iop.c b/drivers/block/swim_iop.c
index 283c5b6bcf3e30572417a8ab4074c95634da87c4..a1283f6dc0189e1ee0d3d7b0622ea875f2333b5d 100644 (file)
--- a/drivers/block/swim_iop.c
+++ b/drivers/block/swim_iop.c
@@ -76,7 +76,7 @@ static struct swim_iop_req *current_req;
 static int floppy_count;
 
 static struct floppy_state floppy_states[MAX_FLOPPIES];
-static spinlock_t swim_iop_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(swim_iop_lock);
 
 #define CURRENT elv_next_request(swim_queue)
 

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 4ca684455300537f2aa5c96bbd5bc71b3fa0c868..84991b28a9bc83abc2b9645ef84becbcb2a3eab5 100644 (file)
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -336,7 +336,7 @@ MODULE_DEVICE_TABLE(usb, ub_usb_ids);
  */
 #define UB_MAX_HOSTS  26
 static char ub_hostv[UB_MAX_HOSTS];
-static spinlock_t ub_lock = SPIN_LOCK_UNLOCKED;        /* Locks globals and ->openc */
+static DEFINE_SPINLOCK(ub_lock);       /* Locks globals and ->openc */
 
 /*
  * The SCSI command tracing procedures.

diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 321d53dfe1597b7850121421eb8eecd4d4872066..fbc95a96f6e267bbf8ef08743871e585f8f63420 100644 (file)
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -72,7 +72,7 @@ enum {
        MAX_DISK_NAME = sizeof(((struct gendisk *)0)->disk_name)
 };
 
-static spinlock_t      viodasd_spinlock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(viodasd_spinlock);
 
 #define VIOMAXREQ              16
 #define VIOMAXBLOCKDMA         12

diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 2fa910e06425d317fc1ff0171ee8523c7191e571..3fbadc82ad43c7971019f4ae42583238141c2bfd 100644 (file)
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -123,7 +123,7 @@ static unsigned int xd_bases[] __initdata =
        0xE0000
 };
 
-static spinlock_t xd_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(xd_lock);
 
 static struct gendisk *xd_gendisk[2];
 

diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 8dc889498306a63fd9bf53b32bee88593e0b3c9f..007f6a6624392c6427601306dddebbda745d60e9 100644 (file)
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -65,7 +65,7 @@ static int chip_count       = 0;
 static int list_count       = 0;
 static int current_device   = -1;
 
-static spinlock_t z2ram_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(z2ram_lock);
 
 static struct block_device_operations z2_fops;
 static struct gendisk *z2ram_gendisk;