diff options
author | Joe Perches <joe@perches.com> | 2014-03-25 15:35:05 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-07-10 12:35:04 -0400 |
commit | 659b2e3bb8b149f5f7e2f8551599044b715bcc21 (patch) | |
tree | dbadaaabe32e089ef1af17ccf9f1ed68de2a3c4c | |
parent | ccdd6a93ee0c4a68cfaeddc80a87fc092ff35b96 (diff) |
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>
-rw-r--r-- | drivers/block/drbd/drbd_int.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index fe6595a96a9a..b0ab358c39e6 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
@@ -1867,7 +1867,7 @@ static inline void inc_ap_pending(struct drbd_device *device) | |||
1867 | func, line, \ | 1867 | func, line, \ |
1868 | atomic_read(&device->which)) | 1868 | atomic_read(&device->which)) |
1869 | 1869 | ||
1870 | #define dec_ap_pending(device) _dec_ap_pending(device, __FUNCTION__, __LINE__) | 1870 | #define dec_ap_pending(device) _dec_ap_pending(device, __func__, __LINE__) |
1871 | static inline void _dec_ap_pending(struct drbd_device *device, const char *func, int line) | 1871 | static inline void _dec_ap_pending(struct drbd_device *device, const char *func, int line) |
1872 | { | 1872 | { |
1873 | if (atomic_dec_and_test(&device->ap_pending_cnt)) | 1873 | if (atomic_dec_and_test(&device->ap_pending_cnt)) |
@@ -1886,7 +1886,7 @@ static inline void inc_rs_pending(struct drbd_device *device) | |||
1886 | atomic_inc(&device->rs_pending_cnt); | 1886 | atomic_inc(&device->rs_pending_cnt); |
1887 | } | 1887 | } |
1888 | 1888 | ||
1889 | #define dec_rs_pending(device) _dec_rs_pending(device, __FUNCTION__, __LINE__) | 1889 | #define dec_rs_pending(device) _dec_rs_pending(device, __func__, __LINE__) |
1890 | static inline void _dec_rs_pending(struct drbd_device *device, const char *func, int line) | 1890 | static inline void _dec_rs_pending(struct drbd_device *device, const char *func, int line) |
1891 | { | 1891 | { |
1892 | atomic_dec(&device->rs_pending_cnt); | 1892 | atomic_dec(&device->rs_pending_cnt); |
@@ -1907,14 +1907,14 @@ static inline void inc_unacked(struct drbd_device *device) | |||
1907 | atomic_inc(&device->unacked_cnt); | 1907 | atomic_inc(&device->unacked_cnt); |
1908 | } | 1908 | } |
1909 | 1909 | ||
1910 | #define dec_unacked(device) _dec_unacked(device, __FUNCTION__, __LINE__) | 1910 | #define dec_unacked(device) _dec_unacked(device, __func__, __LINE__) |
1911 | static inline void _dec_unacked(struct drbd_device *device, const char *func, int line) | 1911 | static inline void _dec_unacked(struct drbd_device *device, const char *func, int line) |
1912 | { | 1912 | { |
1913 | atomic_dec(&device->unacked_cnt); | 1913 | atomic_dec(&device->unacked_cnt); |
1914 | ERR_IF_CNT_IS_NEGATIVE(unacked_cnt, func, line); | 1914 | ERR_IF_CNT_IS_NEGATIVE(unacked_cnt, func, line); |
1915 | } | 1915 | } |
1916 | 1916 | ||
1917 | #define sub_unacked(device, n) _sub_unacked(device, n, __FUNCTION__, __LINE__) | 1917 | #define sub_unacked(device, n) _sub_unacked(device, n, __func__, __LINE__) |
1918 | static inline void _sub_unacked(struct drbd_device *device, int n, const char *func, int line) | 1918 | static inline void _sub_unacked(struct drbd_device *device, int n, const char *func, int line) |
1919 | { | 1919 | { |
1920 | atomic_sub(n, &device->unacked_cnt); | 1920 | atomic_sub(n, &device->unacked_cnt); |