Commit 2a2cf6b1 authored by Harvey Harrison's avatar Harvey Harrison Committed by Heiko Carstens

[S390] replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 1e42f327
...@@ -980,12 +980,12 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, ...@@ -980,12 +980,12 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
break; break;
case -ETIMEDOUT: case -ETIMEDOUT:
printk(KERN_WARNING"%s(%s): request timed out\n", printk(KERN_WARNING"%s(%s): request timed out\n",
__FUNCTION__, cdev->dev.bus_id); __func__, cdev->dev.bus_id);
//FIXME - dasd uses own timeout interface... //FIXME - dasd uses own timeout interface...
break; break;
default: default:
printk(KERN_WARNING"%s(%s): unknown error %ld\n", printk(KERN_WARNING"%s(%s): unknown error %ld\n",
__FUNCTION__, cdev->dev.bus_id, PTR_ERR(irb)); __func__, cdev->dev.bus_id, PTR_ERR(irb));
} }
return; return;
} }
......
...@@ -394,7 +394,7 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request, ...@@ -394,7 +394,7 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request,
return tape_34xx_erp_failed(request, -ENOSPC); return tape_34xx_erp_failed(request, -ENOSPC);
default: default:
PRINT_ERR("Invalid op in %s:%i\n", PRINT_ERR("Invalid op in %s:%i\n",
__FUNCTION__, __LINE__); __func__, __LINE__);
return tape_34xx_erp_failed(request, 0); return tape_34xx_erp_failed(request, 0);
} }
} }
......
...@@ -96,7 +96,7 @@ static int vmwdt_keepalive(void) ...@@ -96,7 +96,7 @@ static int vmwdt_keepalive(void)
if (ret) { if (ret) {
printk(KERN_WARNING "%s: problem setting interval %d, " printk(KERN_WARNING "%s: problem setting interval %d, "
"cmd %s\n", __FUNCTION__, vmwdt_interval, "cmd %s\n", __func__, vmwdt_interval,
vmwdt_cmd); vmwdt_cmd);
} }
return ret; return ret;
...@@ -107,7 +107,7 @@ static int vmwdt_disable(void) ...@@ -107,7 +107,7 @@ static int vmwdt_disable(void)
int ret = __diag288(wdt_cancel, 0, "", 0); int ret = __diag288(wdt_cancel, 0, "", 0);
if (ret) { if (ret) {
printk(KERN_WARNING "%s: problem disabling watchdog\n", printk(KERN_WARNING "%s: problem disabling watchdog\n",
__FUNCTION__); __func__);
} }
return ret; return ret;
} }
......
...@@ -224,7 +224,7 @@ static int __init init_cpu_info(enum arch_id arch) ...@@ -224,7 +224,7 @@ static int __init init_cpu_info(enum arch_id arch)
sa = kmalloc(sizeof(*sa), GFP_KERNEL); sa = kmalloc(sizeof(*sa), GFP_KERNEL);
if (!sa) { if (!sa) {
ERROR_MSG("kmalloc failed: %s: %i\n",__FUNCTION__, __LINE__); ERROR_MSG("kmalloc failed: %s: %i\n",__func__, __LINE__);
return -ENOMEM; return -ENOMEM;
} }
if (memcpy_hsa_kernel(sa, sys_info.sa_base, sys_info.sa_size) < 0) { if (memcpy_hsa_kernel(sa, sys_info.sa_base, sys_info.sa_size) < 0) {
......
...@@ -62,7 +62,7 @@ ccw_device_path_notoper(struct ccw_device *cdev) ...@@ -62,7 +62,7 @@ ccw_device_path_notoper(struct ccw_device *cdev)
stsch (sch->schid, &sch->schib); stsch (sch->schid, &sch->schib);
CIO_MSG_EVENT(0, "%s(0.%x.%04x) - path(s) %02x are " CIO_MSG_EVENT(0, "%s(0.%x.%04x) - path(s) %02x are "
"not operational \n", __FUNCTION__, "not operational \n", __func__,
sch->schid.ssid, sch->schid.sch_no, sch->schid.ssid, sch->schid.sch_no,
sch->schib.pmcw.pnom); sch->schib.pmcw.pnom);
......
...@@ -43,17 +43,17 @@ ...@@ -43,17 +43,17 @@
#define DEV_NAME "zcrypt" #define DEV_NAME "zcrypt"
#define PRINTK(fmt, args...) \ #define PRINTK(fmt, args...) \
printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __func__ , ## args)
#define PRINTKN(fmt, args...) \ #define PRINTKN(fmt, args...) \
printk(KERN_DEBUG DEV_NAME ": " fmt, ## args) printk(KERN_DEBUG DEV_NAME ": " fmt, ## args)
#define PRINTKW(fmt, args...) \ #define PRINTKW(fmt, args...) \
printk(KERN_WARNING DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) printk(KERN_WARNING DEV_NAME ": %s -> " fmt, __func__ , ## args)
#define PRINTKC(fmt, args...) \ #define PRINTKC(fmt, args...) \
printk(KERN_CRIT DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) printk(KERN_CRIT DEV_NAME ": %s -> " fmt, __func__ , ## args)
#ifdef ZCRYPT_DEBUG #ifdef ZCRYPT_DEBUG
#define PDEBUG(fmt, args...) \ #define PDEBUG(fmt, args...) \
printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __func__ , ## args)
#else #else
#define PDEBUG(fmt, args...) do {} while (0) #define PDEBUG(fmt, args...) do {} while (0)
#endif #endif
......
This diff is collapsed.
This diff is collapsed.
...@@ -59,15 +59,15 @@ repeat: ...@@ -59,15 +59,15 @@ repeat:
printk(KERN_WARNING"%s: Code does not support more " printk(KERN_WARNING"%s: Code does not support more "
"than two chained crws; please report to " "than two chained crws; please report to "
"linux390@de.ibm.com!\n", __FUNCTION__); "linux390@de.ibm.com!\n", __func__);
ccode = stcrw(&tmp_crw); ccode = stcrw(&tmp_crw);
printk(KERN_WARNING"%s: crw reports slct=%d, oflw=%d, " printk(KERN_WARNING"%s: crw reports slct=%d, oflw=%d, "
"chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n", "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n",
__FUNCTION__, tmp_crw.slct, tmp_crw.oflw, __func__, tmp_crw.slct, tmp_crw.oflw,
tmp_crw.chn, tmp_crw.rsc, tmp_crw.anc, tmp_crw.chn, tmp_crw.rsc, tmp_crw.anc,
tmp_crw.erc, tmp_crw.rsid); tmp_crw.erc, tmp_crw.rsid);
printk(KERN_WARNING"%s: This was crw number %x in the " printk(KERN_WARNING"%s: This was crw number %x in the "
"chain\n", __FUNCTION__, chain); "chain\n", __func__, chain);
if (ccode != 0) if (ccode != 0)
break; break;
chain = tmp_crw.chn ? chain + 1 : 0; chain = tmp_crw.chn ? chain + 1 : 0;
...@@ -83,7 +83,7 @@ repeat: ...@@ -83,7 +83,7 @@ repeat:
crw[chain].rsid); crw[chain].rsid);
/* Check for overflows. */ /* Check for overflows. */
if (crw[chain].oflw) { if (crw[chain].oflw) {
pr_debug("%s: crw overflow detected!\n", __FUNCTION__); pr_debug("%s: crw overflow detected!\n", __func__);
css_schedule_eval_all(); css_schedule_eval_all();
chain = 0; chain = 0;
continue; continue;
......
...@@ -539,7 +539,7 @@ struct zfcp_rc_entry { ...@@ -539,7 +539,7 @@ struct zfcp_rc_entry {
/* logging routine for zfcp */ /* logging routine for zfcp */
#define _ZFCP_LOG(fmt, args...) \ #define _ZFCP_LOG(fmt, args...) \
printk(KERN_ERR ZFCP_NAME": %s(%d): " fmt, __FUNCTION__, \ printk(KERN_ERR ZFCP_NAME": %s(%d): " fmt, __func__, \
__LINE__ , ##args) __LINE__ , ##args)
#define ZFCP_LOG(level, fmt, args...) \ #define ZFCP_LOG(level, fmt, args...) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment