diff options
Diffstat (limited to 'drivers/infiniband/hw/nes/nes.h')
-rw-r--r-- | drivers/infiniband/hw/nes/nes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h index bd92be79b63e..1626124a156d 100644 --- a/drivers/infiniband/hw/nes/nes.h +++ b/drivers/infiniband/hw/nes/nes.h | |||
@@ -143,12 +143,12 @@ | |||
143 | #ifdef CONFIG_INFINIBAND_NES_DEBUG | 143 | #ifdef CONFIG_INFINIBAND_NES_DEBUG |
144 | #define nes_debug(level, fmt, args...) \ | 144 | #define nes_debug(level, fmt, args...) \ |
145 | if (level & nes_debug_level) \ | 145 | if (level & nes_debug_level) \ |
146 | printk(KERN_ERR PFX "%s[%u]: " fmt, __FUNCTION__, __LINE__, ##args) | 146 | printk(KERN_ERR PFX "%s[%u]: " fmt, __func__, __LINE__, ##args) |
147 | 147 | ||
148 | #define assert(expr) \ | 148 | #define assert(expr) \ |
149 | if (!(expr)) { \ | 149 | if (!(expr)) { \ |
150 | printk(KERN_ERR PFX "Assertion failed! %s, %s, %s, line %d\n", \ | 150 | printk(KERN_ERR PFX "Assertion failed! %s, %s, %s, line %d\n", \ |
151 | #expr, __FILE__, __FUNCTION__, __LINE__); \ | 151 | #expr, __FILE__, __func__, __LINE__); \ |
152 | } | 152 | } |
153 | 153 | ||
154 | #define NES_EVENT_TIMEOUT 1200000 | 154 | #define NES_EVENT_TIMEOUT 1200000 |
@@ -399,7 +399,7 @@ static inline int nes_alloc_resource(struct nes_adapter *nesadapter, | |||
399 | if (resource_num >= max_resources) { | 399 | if (resource_num >= max_resources) { |
400 | resource_num = find_first_zero_bit(resource_array, max_resources); | 400 | resource_num = find_first_zero_bit(resource_array, max_resources); |
401 | if (resource_num >= max_resources) { | 401 | if (resource_num >= max_resources) { |
402 | printk(KERN_ERR PFX "%s: No available resourcess.\n", __FUNCTION__); | 402 | printk(KERN_ERR PFX "%s: No available resourcess.\n", __func__); |
403 | spin_unlock_irqrestore(&nesadapter->resource_lock, flags); | 403 | spin_unlock_irqrestore(&nesadapter->resource_lock, flags); |
404 | return -EMFILE; | 404 | return -EMFILE; |
405 | } | 405 | } |