block: Convert last uses of __FUNCTION__ to __func__

Just about all of these have been converted to __func__,
so convert the last uses.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Joe Perches 2014-03-25 12:35:05 -07:00 committed by Philipp Reisner
parent ccdd6a93ee
commit 659b2e3bb8
1 changed files with 4 additions and 4 deletions

View File

@ -1867,7 +1867,7 @@ static inline void inc_ap_pending(struct drbd_device *device)
func, line, \ func, line, \
atomic_read(&device->which)) atomic_read(&device->which))
#define dec_ap_pending(device) _dec_ap_pending(device, __FUNCTION__, __LINE__) #define dec_ap_pending(device) _dec_ap_pending(device, __func__, __LINE__)
static inline void _dec_ap_pending(struct drbd_device *device, const char *func, int line) static inline void _dec_ap_pending(struct drbd_device *device, const char *func, int line)
{ {
if (atomic_dec_and_test(&device->ap_pending_cnt)) if (atomic_dec_and_test(&device->ap_pending_cnt))
@ -1886,7 +1886,7 @@ static inline void inc_rs_pending(struct drbd_device *device)
atomic_inc(&device->rs_pending_cnt); atomic_inc(&device->rs_pending_cnt);
} }
#define dec_rs_pending(device) _dec_rs_pending(device, __FUNCTION__, __LINE__) #define dec_rs_pending(device) _dec_rs_pending(device, __func__, __LINE__)
static inline void _dec_rs_pending(struct drbd_device *device, const char *func, int line) static inline void _dec_rs_pending(struct drbd_device *device, const char *func, int line)
{ {
atomic_dec(&device->rs_pending_cnt); atomic_dec(&device->rs_pending_cnt);
@ -1907,14 +1907,14 @@ static inline void inc_unacked(struct drbd_device *device)
atomic_inc(&device->unacked_cnt); atomic_inc(&device->unacked_cnt);
} }
#define dec_unacked(device) _dec_unacked(device, __FUNCTION__, __LINE__) #define dec_unacked(device) _dec_unacked(device, __func__, __LINE__)
static inline void _dec_unacked(struct drbd_device *device, const char *func, int line) static inline void _dec_unacked(struct drbd_device *device, const char *func, int line)
{ {
atomic_dec(&device->unacked_cnt); atomic_dec(&device->unacked_cnt);
ERR_IF_CNT_IS_NEGATIVE(unacked_cnt, func, line); ERR_IF_CNT_IS_NEGATIVE(unacked_cnt, func, line);
} }
#define sub_unacked(device, n) _sub_unacked(device, n, __FUNCTION__, __LINE__) #define sub_unacked(device, n) _sub_unacked(device, n, __func__, __LINE__)
static inline void _sub_unacked(struct drbd_device *device, int n, const char *func, int line) static inline void _sub_unacked(struct drbd_device *device, int n, const char *func, int line)
{ {
atomic_sub(n, &device->unacked_cnt); atomic_sub(n, &device->unacked_cnt);