projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ide: make ide_hwif_t.ide_dma_host_on void (v2)
[powerpc.git]
/
net
/
tipc
/
ref.h
diff --git
a/net/tipc/ref.h
b/net/tipc/ref.h
index
4f8f9f4
..
38f3a7f
100644
(file)
--- a/
net/tipc/ref.h
+++ b/
net/tipc/ref.h
@@
-1,6
+1,6
@@
/*
* net/tipc/ref.h: Include file for TIPC object registry code
/*
* net/tipc/ref.h: Include file for TIPC object registry code
- *
+ *
* Copyright (c) 1991-2006, Ericsson AB
* Copyright (c) 2005, Wind River Systems
* All rights reserved.
* Copyright (c) 1991-2006, Ericsson AB
* Copyright (c) 2005, Wind River Systems
* All rights reserved.
@@
-43,7
+43,7
@@
* @lock: spinlock controlling access to object
* @data: reference value associated with object (or link to next unused entry)
*/
* @lock: spinlock controlling access to object
* @data: reference value associated with object (or link to next unused entry)
*/
-
+
struct reference {
void *object;
spinlock_t lock;
struct reference {
void *object;
spinlock_t lock;
@@
-92,11
+92,11
@@
static inline void *tipc_ref_lock(u32 ref)
return r->object;
spin_unlock_bh(&r->lock);
}
return r->object;
spin_unlock_bh(&r->lock);
}
- return
0
;
+ return
NULL
;
}
/**
}
/**
- * tipc_ref_unlock - unlock referenced object
+ * tipc_ref_unlock - unlock referenced object
*/
static inline void tipc_ref_unlock(u32 ref)
*/
static inline void tipc_ref_unlock(u32 ref)
@@
-119,13
+119,13
@@
static inline void tipc_ref_unlock(u32 ref)
static inline void *tipc_ref_deref(u32 ref)
{
if (likely(tipc_ref_table.entries)) {
static inline void *tipc_ref_deref(u32 ref)
{
if (likely(tipc_ref_table.entries)) {
- struct reference *r =
+ struct reference *r =
&tipc_ref_table.entries[ref & tipc_ref_table.index_mask];
if (likely(r->data.reference == ref))
return r->object;
}
&tipc_ref_table.entries[ref & tipc_ref_table.index_mask];
if (likely(r->data.reference == ref))
return r->object;
}
- return
0
;
+ return
NULL
;
}
#endif
}
#endif