Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 34af946a22724c4e2b204957f2b24b22a0fb121c

Authored by Ingo Molnar
Committed by Linus Torvalds
1 parent b6cd0b772d
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] spin/rwlock init cleanups 

locking init cleanups:

 - convert " = SPIN_LOCK_UNLOCKED" to spin_lock_init() or DEFINE_SPINLOCK()
 - convert rwlocks in a similar manner

this patch was generated automatically.

Motivation:

 - cleanliness
 - lockdep needs control of lock initialization, which the open-coded
   variants do not give
 - it's also useful for -rt and for lock debugging in general

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 51 changed files with 59 additions and 59 deletions Side-by-side Diff

arch/ia64/sn/kernel/irq.c
Diff comments   View file @ 34af946
... ... @@ -27,7 +27,7 @@
27 27 int sn_force_interrupt_flag = 1;
28 28 extern int sn_ioif_inited;
29 29 struct list_head **sn_irq_lh;
30   -static spinlock_t sn_irq_info_lock = SPIN_LOCK_UNLOCKED; /* non-IRQ lock */
  30 +static DEFINE_SPINLOCK(sn_irq_info_lock); /* non-IRQ lock */
31 31  
32 32 u64 sn_intr_alloc(nasid_t local_nasid, int local_widget,
33 33 struct sn_irq_info *sn_irq_info,
arch/mips/kernel/smtc.c
Diff comments   View file @ 34af946
... ... @@ -367,7 +367,7 @@
367 367 dvpe();
368 368 dmt();
369 369  
370   - freeIPIq.lock = SPIN_LOCK_UNLOCKED;
  370 + spin_lock_init(&freeIPIq.lock);
371 371  
372 372 /*
373 373 * We probably don't have as many VPEs as we do SMP "CPUs",
... ... @@ -375,7 +375,7 @@
375 375 */
376 376 for (i=0; i<NR_CPUS; i++) {
377 377 IPIQ[i].head = IPIQ[i].tail = NULL;
378   - IPIQ[i].lock = SPIN_LOCK_UNLOCKED;
  378 + spin_lock_init(&IPIQ[i].lock);
379 379 IPIQ[i].depth = 0;
380 380 ipi_timer_latch[i] = 0;
381 381 }
arch/powerpc/platforms/cell/spufs/switch.c
Diff comments   View file @ 34af946
... ... @@ -2203,7 +2203,7 @@
2203 2203  
2204 2204 memset(lscsa, 0, sizeof(struct spu_lscsa));
2205 2205 csa->lscsa = lscsa;
2206   - csa->register_lock = SPIN_LOCK_UNLOCKED;
  2206 + spin_lock_init(&csa->register_lock);
2207 2207  
2208 2208 /* Set LS pages reserved to allow for user-space mapping. */
2209 2209 for (p = lscsa->ls; p < lscsa->ls + LS_SIZE; p += PAGE_SIZE)
arch/powerpc/platforms/powermac/pfunc_core.c
Diff comments   View file @ 34af946
... ... @@ -546,7 +546,7 @@
546 546 };
547 547  
548 548 static LIST_HEAD(pmf_devices);
549   -static spinlock_t pmf_lock = SPIN_LOCK_UNLOCKED;
  549 +static DEFINE_SPINLOCK(pmf_lock);
550 550 static DEFINE_MUTEX(pmf_irq_mutex);
551 551  
552 552 static void pmf_release_device(struct kref *kref)
arch/powerpc/platforms/pseries/eeh_event.c
Diff comments   View file @ 34af946
... ... @@ -35,7 +35,7 @@
35 35 */
36 36  
37 37 /* EEH event workqueue setup. */
38   -static spinlock_t eeh_eventlist_lock = SPIN_LOCK_UNLOCKED;
  38 +static DEFINE_SPINLOCK(eeh_eventlist_lock);
39 39 LIST_HEAD(eeh_eventlist);
40 40 static void eeh_thread_launcher(void *);
41 41 DECLARE_WORK(eeh_event_wq, eeh_thread_launcher, NULL);
arch/powerpc/sysdev/mmio_nvram.c
Diff comments   View file @ 34af946
... ... @@ -32,7 +32,7 @@
32 32  
33 33 static void __iomem *mmio_nvram_start;
34 34 static long mmio_nvram_len;
35   -static spinlock_t mmio_nvram_lock = SPIN_LOCK_UNLOCKED;
  35 +static DEFINE_SPINLOCK(mmio_nvram_lock);
36 36  
37 37 static ssize_t mmio_nvram_read(char *buf, size_t count, loff_t *index)
38 38 {
arch/xtensa/kernel/time.c
Diff comments   View file @ 34af946
... ... @@ -29,7 +29,7 @@
29 29  
30 30 extern volatile unsigned long wall_jiffies;
31 31  
32   -spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;
  32 +DEFINE_SPINLOCK(rtc_lock);
33 33 EXPORT_SYMBOL(rtc_lock);
34 34  
35 35  
arch/xtensa/kernel/traps.c
Diff comments   View file @ 34af946
... ... @@ -461,7 +461,7 @@
461 461 }
462 462 }
463 463  
464   -spinlock_t die_lock = SPIN_LOCK_UNLOCKED;
  464 +DEFINE_SPINLOCK(die_lock);
465 465  
466 466 void die(const char * str, struct pt_regs * regs, long err)
467 467 {
drivers/char/drm/drm_memory_debug.h
Diff comments   View file @ 34af946
... ... @@ -43,7 +43,7 @@
43 43 unsigned long bytes_freed;
44 44 } drm_mem_stats_t;
45 45  
46   -static spinlock_t drm_mem_lock = SPIN_LOCK_UNLOCKED;
  46 +static DEFINE_SPINLOCK(drm_mem_lock);
47 47 static unsigned long drm_ram_available = 0; /* In pages */
48 48 static unsigned long drm_ram_used = 0;
49 49 static drm_mem_stats_t drm_mem_stats[] =
drivers/char/drm/via_dmablit.c
Diff comments   View file @ 34af946
... ... @@ -557,7 +557,7 @@
557 557 blitq->num_outstanding = 0;
558 558 blitq->is_active = 0;
559 559 blitq->aborting = 0;
560   - blitq->blit_lock = SPIN_LOCK_UNLOCKED;
  560 + spin_lock_init(&blitq->blit_lock);
561 561 for (j=0; j<VIA_NUM_BLIT_SLOTS; ++j) {
562 562 DRM_INIT_WAITQUEUE(blitq->blit_queue + j);
563 563 }
... ... @@ -80,7 +80,7 @@
80 80 /* The ISA boards do window flipping into the same spaces so its only sane
81 81 with a single lock. It's still pretty efficient */
82 82  
83   -static spinlock_t epca_lock = SPIN_LOCK_UNLOCKED;
  83 +static DEFINE_SPINLOCK(epca_lock);
84 84  
85 85 /* -----------------------------------------------------------------------
86 86 MAXBOARDS is typically 12, but ISA and EISA cards are restricted to
... ... @@ -301,7 +301,7 @@
301 301 .tiocmset = moxa_tiocmset,
302 302 };
303 303  
304   -static spinlock_t moxa_lock = SPIN_LOCK_UNLOCKED;
  304 +static DEFINE_SPINLOCK(moxa_lock);
305 305  
306 306 #ifdef CONFIG_PCI
307 307 static int moxa_get_PCI_conf(struct pci_dev *p, int board_type, moxa_board_conf * board)
drivers/char/specialix.c
Diff comments   View file @ 34af946
... ... @@ -2477,7 +2477,7 @@
2477 2477 #endif
2478 2478  
2479 2479 for (i = 0; i < SX_NBOARD; i++)
2480   - sx_board[i].lock = SPIN_LOCK_UNLOCKED;
  2480 + spin_lock_init(&sx_board[i].lock);
2481 2481  
2482 2482 if (sx_init_drivers()) {
2483 2483 func_exit();
... ... @@ -2320,7 +2320,7 @@
2320 2320 #ifdef NEW_WRITE_LOCKING
2321 2321 port->gs.port_write_mutex = MUTEX;
2322 2322 #endif
2323   - port->gs.driver_lock = SPIN_LOCK_UNLOCKED;
  2323 + spin_lock_init(&port->gs.driver_lock);
2324 2324 /*
2325 2325 * Initializing wait queue
2326 2326 */
drivers/isdn/gigaset/common.c
Diff comments   View file @ 34af946
... ... @@ -981,7 +981,7 @@
981 981 EXPORT_SYMBOL_GPL(gigaset_stop);
982 982  
983 983 static LIST_HEAD(drivers);
984   -static spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
  984 +static DEFINE_SPINLOCK(driver_lock);
985 985  
986 986 struct cardstate *gigaset_get_cs_by_id(int id)
987 987 {
drivers/leds/led-core.c
Diff comments   View file @ 34af946
... ... @@ -18,7 +18,7 @@
18 18 #include <linux/leds.h>
19 19 #include "leds.h"
20 20  
21   -rwlock_t leds_list_lock = RW_LOCK_UNLOCKED;
  21 +DEFINE_RWLOCK(leds_list_lock);
22 22 LIST_HEAD(leds_list);
23 23  
24 24 EXPORT_SYMBOL_GPL(leds_list);
drivers/leds/led-triggers.c
Diff comments   View file @ 34af946
... ... @@ -26,7 +26,7 @@
26 26 /*
27 27 * Nests outside led_cdev->trigger_lock
28 28 */
29   -static rwlock_t triggers_list_lock = RW_LOCK_UNLOCKED;
  29 +static DEFINE_RWLOCK(triggers_list_lock);
30 30 static LIST_HEAD(trigger_list);
31 31  
32 32 ssize_t led_trigger_store(struct class_device *dev, const char *buf,
drivers/misc/ibmasm/module.c
Diff comments   View file @ 34af946
... ... @@ -85,7 +85,7 @@
85 85 }
86 86 memset(sp, 0, sizeof(struct service_processor));
87 87  
88   - sp->lock = SPIN_LOCK_UNLOCKED;
  88 + spin_lock_init(&sp->lock);
89 89 INIT_LIST_HEAD(&sp->command_queue);
90 90  
91 91 pci_set_drvdata(pdev, (void *)sp);
drivers/pcmcia/m8xx_pcmcia.c
Diff comments   View file @ 34af946
... ... @@ -157,7 +157,7 @@
157 157  
158 158 static int pcmcia_schlvl = PCMCIA_SCHLVL;
159 159  
160   -static spinlock_t events_lock = SPIN_LOCK_UNLOCKED;
  160 +static DEFINE_SPINLOCK(events_lock);
161 161  
162 162  
163 163 #define PCMCIA_SOCKET_KEY_5V 1
... ... @@ -644,7 +644,7 @@
644 644 };
645 645  
646 646 static u32 pending_events[PCMCIA_SOCKETS_NO];
647   -static spinlock_t pending_event_lock = SPIN_LOCK_UNLOCKED;
  647 +static DEFINE_SPINLOCK(pending_event_lock);
648 648  
649 649 static irqreturn_t m8xx_interrupt(int irq, void *dev, struct pt_regs *regs)
650 650 {
drivers/rapidio/rio-access.c
Diff comments   View file @ 34af946
... ... @@ -17,8 +17,8 @@
17 17 * These interrupt-safe spinlocks protect all accesses to RIO
18 18 * configuration space and doorbell access.
19 19 */
20   -static spinlock_t rio_config_lock = SPIN_LOCK_UNLOCKED;
21   -static spinlock_t rio_doorbell_lock = SPIN_LOCK_UNLOCKED;
  20 +static DEFINE_SPINLOCK(rio_config_lock);
  21 +static DEFINE_SPINLOCK(rio_doorbell_lock);
22 22  
23 23 /*
24 24 * Wrappers for all RIO configuration access functions. They just check
drivers/rtc/rtc-sa1100.c
Diff comments   View file @ 34af946
... ... @@ -45,7 +45,7 @@
45 45  
46 46 static unsigned long rtc_freq = 1024;
47 47 static struct rtc_time rtc_alarm;
48   -static spinlock_t sa1100_rtc_lock = SPIN_LOCK_UNLOCKED;
  48 +static DEFINE_SPINLOCK(sa1100_rtc_lock);
49 49  
50 50 static int rtc_update_alarm(struct rtc_time *alrm)
51 51 {
drivers/rtc/rtc-vr41xx.c
Diff comments   View file @ 34af946
... ... @@ -93,7 +93,7 @@
93 93  
94 94 static unsigned long epoch = 1970; /* Jan 1 1970 00:00:00 */
95 95  
96   -static spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;
  96 +static DEFINE_SPINLOCK(rtc_lock);
97 97 static char rtc_name[] = "RTC";
98 98 static unsigned long periodic_frequency;
99 99 static unsigned long periodic_count;
drivers/s390/block/dasd_eer.c
Diff comments   View file @ 34af946
... ... @@ -89,7 +89,7 @@
89 89 };
90 90  
91 91 static LIST_HEAD(bufferlist);
92   -static spinlock_t bufferlock = SPIN_LOCK_UNLOCKED;
  92 +static DEFINE_SPINLOCK(bufferlock);
93 93 static DECLARE_WAIT_QUEUE_HEAD(dasd_eer_read_wait_queue);
94 94  
95 95 /*
drivers/scsi/libata-core.c
Diff comments   View file @ 34af946
... ... @@ -5733,7 +5733,7 @@
5733 5733 module_exit(ata_exit);
5734 5734  
5735 5735 static unsigned long ratelimit_time;
5736   -static spinlock_t ata_ratelimit_lock = SPIN_LOCK_UNLOCKED;
  5736 +static DEFINE_SPINLOCK(ata_ratelimit_lock);
5737 5737  
5738 5738 int ata_ratelimit(void)
5739 5739 {
... ... @@ -26,7 +26,7 @@
26 26  
27 27 static struct ioc3_submodule *ioc3_submodules[IOC3_MAX_SUBMODULES];
28 28 static struct ioc3_submodule *ioc3_ethernet;
29   -static rwlock_t ioc3_submodules_lock = RW_LOCK_UNLOCKED;
  29 +static DEFINE_RWLOCK(ioc3_submodules_lock);
30 30  
31 31 /* NIC probing code */
32 32  
drivers/video/backlight/hp680_bl.c
Diff comments   View file @ 34af946
... ... @@ -27,7 +27,7 @@
27 27  
28 28 static int hp680bl_suspended;
29 29 static int current_intensity = 0;
30   -static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED;
  30 +static DEFINE_SPINLOCK(bl_lock);
31 31 static struct backlight_device *hp680_backlight_device;
32 32  
33 33 static void hp680bl_send_intensity(struct backlight_device *bd)
... ... @@ -123,7 +123,7 @@
123 123 */
124 124  
125 125 /* recall_lock protects the del_recall_lru */
126   -static spinlock_t recall_lock = SPIN_LOCK_UNLOCKED;
  126 +static DEFINE_SPINLOCK(recall_lock);
127 127 static struct list_head del_recall_lru;
128 128  
129 129 static void
fs/ocfs2/cluster/heartbeat.c
Diff comments   View file @ 34af946
... ... @@ -54,7 +54,7 @@
54 54 * multiple hb threads are watching multiple regions. A node is live
55 55 * whenever any of the threads sees activity from the node in its region.
56 56 */
57   -static spinlock_t o2hb_live_lock = SPIN_LOCK_UNLOCKED;
  57 +static DEFINE_SPINLOCK(o2hb_live_lock);
58 58 static struct list_head o2hb_live_slots[O2NM_MAX_NODES];
59 59 static unsigned long o2hb_live_node_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)];
60 60 static LIST_HEAD(o2hb_node_events);
fs/ocfs2/cluster/tcp.c
Diff comments   View file @ 34af946
... ... @@ -108,7 +108,7 @@
108 108 ##args); \
109 109 } while (0)
110 110  
111   -static rwlock_t o2net_handler_lock = RW_LOCK_UNLOCKED;
  111 +static DEFINE_RWLOCK(o2net_handler_lock);
112 112 static struct rb_root o2net_handler_tree = RB_ROOT;
113 113  
114 114 static struct o2net_node o2net_nodes[O2NM_MAX_NODES];
fs/ocfs2/dlm/dlmdomain.c
Diff comments   View file @ 34af946
... ... @@ -88,7 +88,7 @@
88 88 *
89 89 */
90 90  
91   -spinlock_t dlm_domain_lock = SPIN_LOCK_UNLOCKED;
  91 +DEFINE_SPINLOCK(dlm_domain_lock);
92 92 LIST_HEAD(dlm_domains);
93 93 static DECLARE_WAIT_QUEUE_HEAD(dlm_domain_events);
94 94  
fs/ocfs2/dlm/dlmlock.c
Diff comments   View file @ 34af946
... ... @@ -53,7 +53,7 @@
53 53 #define MLOG_MASK_PREFIX ML_DLM
54 54 #include "cluster/masklog.h"
55 55  
56   -static spinlock_t dlm_cookie_lock = SPIN_LOCK_UNLOCKED;
  56 +static DEFINE_SPINLOCK(dlm_cookie_lock);
57 57 static u64 dlm_next_cookie = 1;
58 58  
59 59 static enum dlm_status dlm_send_remote_lock_request(struct dlm_ctxt *dlm,
fs/ocfs2/dlm/dlmrecovery.c
Diff comments   View file @ 34af946
... ... @@ -98,8 +98,8 @@
98 98  
99 99 static u64 dlm_get_next_mig_cookie(void);
100 100  
101   -static spinlock_t dlm_reco_state_lock = SPIN_LOCK_UNLOCKED;
102   -static spinlock_t dlm_mig_cookie_lock = SPIN_LOCK_UNLOCKED;
  101 +static DEFINE_SPINLOCK(dlm_reco_state_lock);
  102 +static DEFINE_SPINLOCK(dlm_mig_cookie_lock);
103 103 static u64 dlm_mig_cookie = 1;
104 104  
105 105 static u64 dlm_get_next_mig_cookie(void)
... ... @@ -242,7 +242,7 @@
242 242 mlog_exit_void();
243 243 }
244 244  
245   -static spinlock_t ocfs2_dlm_tracking_lock = SPIN_LOCK_UNLOCKED;
  245 +static DEFINE_SPINLOCK(ocfs2_dlm_tracking_lock);
246 246  
247 247 static void ocfs2_add_lockres_tracking(struct ocfs2_lock_res *res,
248 248 struct ocfs2_dlm_debug *dlm_debug)
... ... @@ -49,7 +49,7 @@
49 49  
50 50 #include "buffer_head_io.h"
51 51  
52   -spinlock_t trans_inc_lock = SPIN_LOCK_UNLOCKED;
  52 +DEFINE_SPINLOCK(trans_inc_lock);
53 53  
54 54 static int ocfs2_force_read_journal(struct inode *inode);
55 55 static int ocfs2_recover_node(struct ocfs2_super *osb,
include/asm-alpha/core_t2.h
Diff comments   View file @ 34af946
... ... @@ -435,7 +435,7 @@
435 435 set_hae(msb); \
436 436 }
437 437  
438   -static spinlock_t t2_hae_lock = SPIN_LOCK_UNLOCKED;
  438 +static DEFINE_SPINLOCK(t2_hae_lock);
439 439  
440 440 __EXTERN_INLINE u8 t2_readb(const volatile void __iomem *xaddr)
441 441 {
... ... @@ -818,7 +818,7 @@
818 818 */
819 819 unsigned int audit_serial(void)
820 820 {
821   - static spinlock_t serial_lock = SPIN_LOCK_UNLOCKED;
  821 + static DEFINE_SPINLOCK(serial_lock);
822 822 static unsigned int serial = 0;
823 823  
824 824 unsigned long flags;
... ... @@ -45,7 +45,7 @@
45 45  
46 46 static int sparse_index_init(unsigned long section_nr, int nid)
47 47 {
48   - static spinlock_t index_init_lock = SPIN_LOCK_UNLOCKED;
  48 + static DEFINE_SPINLOCK(index_init_lock);
49 49 unsigned long root = SECTION_NR_TO_ROOT(section_nr);
50 50 struct mem_section *section;
51 51 int ret = 0;
... ... @@ -349,7 +349,7 @@
349 349 (strict & RT6_SELECT_F_REACHABLE) &&
350 350 last && last != rt0) {
351 351 /* no entries matched; do round-robin */
352   - static spinlock_t lock = SPIN_LOCK_UNLOCKED;
  352 + static DEFINE_SPINLOCK(lock);
353 353 spin_lock(&lock);
354 354 *head = rt0->u.next;
355 355 rt0->u.next = last->u.next;
net/sunrpc/auth_gss/gss_krb5_seal.c
Diff comments   View file @ 34af946
... ... @@ -70,7 +70,7 @@
70 70 # define RPCDBG_FACILITY RPCDBG_AUTH
71 71 #endif
72 72  
73   -spinlock_t krb5_seq_lock = SPIN_LOCK_UNLOCKED;
  73 +DEFINE_SPINLOCK(krb5_seq_lock);
74 74  
75 75 u32
76 76 gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,
... ... @@ -117,7 +117,7 @@
117 117 static struct bcbearer *bcbearer = NULL;
118 118 static struct bclink *bclink = NULL;
119 119 static struct link *bcl = NULL;
120   -static spinlock_t bc_lock = SPIN_LOCK_UNLOCKED;
  120 +static DEFINE_SPINLOCK(bc_lock);
121 121  
122 122 char tipc_bclink_name[] = "multicast-link";
123 123  
... ... @@ -796,7 +796,7 @@
796 796 memset(bclink, 0, sizeof(struct bclink));
797 797 INIT_LIST_HEAD(&bcl->waiting_ports);
798 798 bcl->next_out_no = 1;
799   - bclink->node.lock = SPIN_LOCK_UNLOCKED;
  799 + spin_lock_init(&bclink->node.lock);
800 800 bcl->owner = &bclink->node;
801 801 bcl->max_pkt = MAX_PKT_DEFAULT_MCAST;
802 802 tipc_link_set_queue_limits(bcl, BCLINK_WIN_DEFAULT);
... ... @@ -566,7 +566,7 @@
566 566 b_ptr->link_req = tipc_disc_init_link_req(b_ptr, &m_ptr->bcast_addr,
567 567 bcast_scope, 2);
568 568 }
569   - b_ptr->publ.lock = SPIN_LOCK_UNLOCKED;
  569 + spin_lock_init(&b_ptr->publ.lock);
570 570 write_unlock_bh(&tipc_net_lock);
571 571 info("Enabled bearer <%s>, discovery domain %s, priority %u\n",
572 572 name, addr_string_fill(addr_string, bcast_scope), priority);
... ... @@ -63,7 +63,7 @@
63 63  
64 64 static struct manager mng = { 0};
65 65  
66   -static spinlock_t config_lock = SPIN_LOCK_UNLOCKED;
  66 +static DEFINE_SPINLOCK(config_lock);
67 67  
68 68 static const void *req_tlv_area; /* request message TLV area */
69 69 static int req_tlv_space; /* request message TLV area size */
... ... @@ -41,7 +41,7 @@
41 41 #define MAX_STRING 512
42 42  
43 43 static char print_string[MAX_STRING];
44   -static spinlock_t print_lock = SPIN_LOCK_UNLOCKED;
  44 +static DEFINE_SPINLOCK(print_lock);
45 45  
46 46 static struct print_buf cons_buf = { NULL, 0, NULL, NULL };
47 47 struct print_buf *TIPC_CONS = &cons_buf;
... ... @@ -44,7 +44,7 @@
44 44  
45 45 static kmem_cache_t *tipc_queue_item_cache;
46 46 static struct list_head signal_queue_head;
47   -static spinlock_t qitem_lock = SPIN_LOCK_UNLOCKED;
  47 +static DEFINE_SPINLOCK(qitem_lock);
48 48 static int handler_enabled = 0;
49 49  
50 50 static void process_signal_queue(unsigned long dummy);
net/tipc/name_table.c
Diff comments   View file @ 34af946
... ... @@ -101,7 +101,7 @@
101 101  
102 102 static struct name_table table = { NULL } ;
103 103 static atomic_t rsv_publ_ok = ATOMIC_INIT(0);
104   -rwlock_t tipc_nametbl_lock = RW_LOCK_UNLOCKED;
  104 +DEFINE_RWLOCK(tipc_nametbl_lock);
105 105  
106 106  
107 107 static int hash(int x)
... ... @@ -172,7 +172,7 @@
172 172 }
173 173  
174 174 memset(nseq, 0, sizeof(*nseq));
175   - nseq->lock = SPIN_LOCK_UNLOCKED;
  175 + spin_lock_init(&nseq->lock);
176 176 nseq->type = type;
177 177 nseq->sseqs = sseq;
178 178 dbg("tipc_nameseq_create(): nseq = %p, type %u, ssseqs %p, ff: %u\n",
... ... @@ -115,7 +115,7 @@
115 115 * - A local spin_lock protecting the queue of subscriber events.
116 116 */
117 117  
118   -rwlock_t tipc_net_lock = RW_LOCK_UNLOCKED;
  118 +DEFINE_RWLOCK(tipc_net_lock);
119 119 struct network tipc_net = { NULL };
120 120  
121 121 struct node *tipc_net_select_remote_node(u32 addr, u32 ref)
... ... @@ -77,7 +77,7 @@
77 77  
78 78 memset(n_ptr, 0, sizeof(*n_ptr));
79 79 n_ptr->addr = addr;
80   - n_ptr->lock = SPIN_LOCK_UNLOCKED;
  80 + spin_lock_init(&n_ptr->lock);
81 81 INIT_LIST_HEAD(&n_ptr->nsub);
82 82 n_ptr->owner = c_ptr;
83 83 tipc_cltr_attach_node(c_ptr, n_ptr);
... ... @@ -57,8 +57,8 @@
57 57 static struct sk_buff *msg_queue_head = NULL;
58 58 static struct sk_buff *msg_queue_tail = NULL;
59 59  
60   -spinlock_t tipc_port_list_lock = SPIN_LOCK_UNLOCKED;
61   -static spinlock_t queue_lock = SPIN_LOCK_UNLOCKED;
  60 +DEFINE_SPINLOCK(tipc_port_list_lock);
  61 +static DEFINE_SPINLOCK(queue_lock);
62 62  
63 63 static LIST_HEAD(ports);
64 64 static void port_handle_node_down(unsigned long ref);
... ... @@ -63,7 +63,7 @@
63 63  
64 64 struct ref_table tipc_ref_table = { NULL };
65 65  
66   -static rwlock_t ref_table_lock = RW_LOCK_UNLOCKED;
  66 +static DEFINE_RWLOCK(ref_table_lock);
67 67  
68 68 /**
69 69 * tipc_ref_table_init - create reference table for objects
... ... @@ -87,7 +87,7 @@
87 87 index_mask = sz - 1;
88 88 for (i = sz - 1; i >= 0; i--) {
89 89 table[i].object = NULL;
90   - table[i].lock = SPIN_LOCK_UNLOCKED;
  90 + spin_lock_init(&table[i].lock);
91 91 table[i].data.next_plus_upper = (start & ~index_mask) + i - 1;
92 92 }
93 93 tipc_ref_table.entries = table;
... ... @@ -457,7 +457,7 @@
457 457 int res = -1;
458 458  
459 459 memset(&topsrv, 0, sizeof (topsrv));
460   - topsrv.lock = SPIN_LOCK_UNLOCKED;
  460 + spin_lock_init(&topsrv.lock);
461 461 INIT_LIST_HEAD(&topsrv.subscriber_list);
462 462  
463 463 spin_lock_bh(&topsrv.lock);
... ... @@ -67,7 +67,7 @@
67 67  
68 68 static struct tipc_user *users = NULL;
69 69 static u32 next_free_user = MAX_USERID + 1;
70   -static spinlock_t reg_lock = SPIN_LOCK_UNLOCKED;
  70 +static DEFINE_SPINLOCK(reg_lock);
71 71  
72 72 /**
73 73 * reg_init - create TIPC user registry (but don't activate it)