aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-17 01:46:21 -0400
committerHeiko Carstens <heiko.carstens@de.ibm.com>2008-04-17 01:47:04 -0400
commit2a2cf6b18626e66b7898013dfa4df8fe2feca568 (patch)
treed8de82bd941bab2b448c3283fe278cbfe51b2ea7
parent1e42f32785dc252191bc8a4825e1fee77519d947 (diff)
[S390] replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat
-rw-r--r--drivers/s390/block/dasd.c4
-rw-r--r--drivers/s390/char/tape_34xx.c2
-rw-r--r--drivers/s390/char/vmwatchdog.c4
-rw-r--r--drivers/s390/char/zcore.c2
-rw-r--r--drivers/s390/cio/device_status.c2
-rw-r--r--drivers/s390/crypto/zcrypt_api.h8
-rw-r--r--drivers/s390/net/claw.c344
-rw-r--r--drivers/s390/net/netiucv.c97
-rw-r--r--drivers/s390/s390mach.c8
-rw-r--r--drivers/s390/scsi/zfcp_def.h2
10 files changed, 236 insertions, 237 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 54f686d2c694..bb72e0a5b0e0 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -980,12 +980,12 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
980 break; 980 break;
981 case -ETIMEDOUT: 981 case -ETIMEDOUT:
982 printk(KERN_WARNING"%s(%s): request timed out\n", 982 printk(KERN_WARNING"%s(%s): request timed out\n",
983 __FUNCTION__, cdev->dev.bus_id); 983 __func__, cdev->dev.bus_id);
984 //FIXME - dasd uses own timeout interface... 984 //FIXME - dasd uses own timeout interface...
985 break; 985 break;
986 default: 986 default:
987 printk(KERN_WARNING"%s(%s): unknown error %ld\n", 987 printk(KERN_WARNING"%s(%s): unknown error %ld\n",
988 __FUNCTION__, cdev->dev.bus_id, PTR_ERR(irb)); 988 __func__, cdev->dev.bus_id, PTR_ERR(irb));
989 } 989 }
990 return; 990 return;
991 } 991 }
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 5b47e9cce75f..874adf365e46 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -394,7 +394,7 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request,
394 return tape_34xx_erp_failed(request, -ENOSPC); 394 return tape_34xx_erp_failed(request, -ENOSPC);
395 default: 395 default:
396 PRINT_ERR("Invalid op in %s:%i\n", 396 PRINT_ERR("Invalid op in %s:%i\n",
397 __FUNCTION__, __LINE__); 397 __func__, __LINE__);
398 return tape_34xx_erp_failed(request, 0); 398 return tape_34xx_erp_failed(request, 0);
399 } 399 }
400 } 400 }
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index 6f40facb1c4d..19f8389291b6 100644
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -96,7 +96,7 @@ static int vmwdt_keepalive(void)
96 96
97 if (ret) { 97 if (ret) {
98 printk(KERN_WARNING "%s: problem setting interval %d, " 98 printk(KERN_WARNING "%s: problem setting interval %d, "
99 "cmd %s\n", __FUNCTION__, vmwdt_interval, 99 "cmd %s\n", __func__, vmwdt_interval,
100 vmwdt_cmd); 100 vmwdt_cmd);
101 } 101 }
102 return ret; 102 return ret;
@@ -107,7 +107,7 @@ static int vmwdt_disable(void)
107 int ret = __diag288(wdt_cancel, 0, "", 0); 107 int ret = __diag288(wdt_cancel, 0, "", 0);
108 if (ret) { 108 if (ret) {
109 printk(KERN_WARNING "%s: problem disabling watchdog\n", 109 printk(KERN_WARNING "%s: problem disabling watchdog\n",
110 __FUNCTION__); 110 __func__);
111 } 111 }
112 return ret; 112 return ret;
113} 113}
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index f523501e6e6c..bbbd14e9d48f 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -224,7 +224,7 @@ static int __init init_cpu_info(enum arch_id arch)
224 224
225 sa = kmalloc(sizeof(*sa), GFP_KERNEL); 225 sa = kmalloc(sizeof(*sa), GFP_KERNEL);
226 if (!sa) { 226 if (!sa) {
227 ERROR_MSG("kmalloc failed: %s: %i\n",__FUNCTION__, __LINE__); 227 ERROR_MSG("kmalloc failed: %s: %i\n",__func__, __LINE__);
228 return -ENOMEM; 228 return -ENOMEM;
229 } 229 }
230 if (memcpy_hsa_kernel(sa, sys_info.sa_base, sys_info.sa_size) < 0) { 230 if (memcpy_hsa_kernel(sa, sys_info.sa_base, sys_info.sa_size) < 0) {
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c
index 4764b9e00b9e..4a38993000f2 100644
--- a/drivers/s390/cio/device_status.c
+++ b/drivers/s390/cio/device_status.c
@@ -62,7 +62,7 @@ ccw_device_path_notoper(struct ccw_device *cdev)
62 stsch (sch->schid, &sch->schib); 62 stsch (sch->schid, &sch->schib);
63 63
64 CIO_MSG_EVENT(0, "%s(0.%x.%04x) - path(s) %02x are " 64 CIO_MSG_EVENT(0, "%s(0.%x.%04x) - path(s) %02x are "
65 "not operational \n", __FUNCTION__, 65 "not operational \n", __func__,
66 sch->schid.ssid, sch->schid.sch_no, 66 sch->schid.ssid, sch->schid.sch_no,
67 sch->schib.pmcw.pnom); 67 sch->schib.pmcw.pnom);
68 68
diff --git a/drivers/s390/crypto/zcrypt_api.h b/drivers/s390/crypto/zcrypt_api.h
index 0e948528a73a..5c6e222b2ac4 100644
--- a/drivers/s390/crypto/zcrypt_api.h
+++ b/drivers/s390/crypto/zcrypt_api.h
@@ -43,17 +43,17 @@
43#define DEV_NAME "zcrypt" 43#define DEV_NAME "zcrypt"
44 44
45#define PRINTK(fmt, args...) \ 45#define PRINTK(fmt, args...) \
46 printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) 46 printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __func__ , ## args)
47#define PRINTKN(fmt, args...) \ 47#define PRINTKN(fmt, args...) \
48 printk(KERN_DEBUG DEV_NAME ": " fmt, ## args) 48 printk(KERN_DEBUG DEV_NAME ": " fmt, ## args)
49#define PRINTKW(fmt, args...) \ 49#define PRINTKW(fmt, args...) \
50 printk(KERN_WARNING DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) 50 printk(KERN_WARNING DEV_NAME ": %s -> " fmt, __func__ , ## args)
51#define PRINTKC(fmt, args...) \ 51#define PRINTKC(fmt, args...) \
52 printk(KERN_CRIT DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) 52 printk(KERN_CRIT DEV_NAME ": %s -> " fmt, __func__ , ## args)
53 53
54#ifdef ZCRYPT_DEBUG 54#ifdef ZCRYPT_DEBUG
55#define PDEBUG(fmt, args...) \ 55#define PDEBUG(fmt, args...) \
56 printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __FUNCTION__ , ## args) 56 printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __func__ , ## args)
57#else 57#else
58#define PDEBUG(fmt, args...) do {} while (0) 58#define PDEBUG(fmt, args...) do {} while (0)
59#endif 59#endif
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index d8a5c229c5a7..04a1d7bf678c 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -299,7 +299,7 @@ claw_probe(struct ccwgroup_device *cgdev)
299 struct claw_privbk *privptr=NULL; 299 struct claw_privbk *privptr=NULL;
300 300
301#ifdef FUNCTRACE 301#ifdef FUNCTRACE
302 printk(KERN_INFO "%s Enter\n",__FUNCTION__); 302 printk(KERN_INFO "%s Enter\n",__func__);
303#endif 303#endif
304 CLAW_DBF_TEXT(2,setup,"probe"); 304 CLAW_DBF_TEXT(2,setup,"probe");
305 if (!get_device(&cgdev->dev)) 305 if (!get_device(&cgdev->dev))
@@ -313,7 +313,7 @@ claw_probe(struct ccwgroup_device *cgdev)
313 probe_error(cgdev); 313 probe_error(cgdev);
314 put_device(&cgdev->dev); 314 put_device(&cgdev->dev);
315 printk(KERN_WARNING "Out of memory %s %s Exit Line %d \n", 315 printk(KERN_WARNING "Out of memory %s %s Exit Line %d \n",
316 cgdev->cdev[0]->dev.bus_id,__FUNCTION__,__LINE__); 316 cgdev->cdev[0]->dev.bus_id,__func__,__LINE__);
317 CLAW_DBF_TEXT_(2,setup,"probex%d",-ENOMEM); 317 CLAW_DBF_TEXT_(2,setup,"probex%d",-ENOMEM);
318 return -ENOMEM; 318 return -ENOMEM;
319 } 319 }
@@ -323,7 +323,7 @@ claw_probe(struct ccwgroup_device *cgdev)
323 probe_error(cgdev); 323 probe_error(cgdev);
324 put_device(&cgdev->dev); 324 put_device(&cgdev->dev);
325 printk(KERN_WARNING "Out of memory %s %s Exit Line %d \n", 325 printk(KERN_WARNING "Out of memory %s %s Exit Line %d \n",
326 cgdev->cdev[0]->dev.bus_id,__FUNCTION__,__LINE__); 326 cgdev->cdev[0]->dev.bus_id,__func__,__LINE__);
327 CLAW_DBF_TEXT_(2,setup,"probex%d",-ENOMEM); 327 CLAW_DBF_TEXT_(2,setup,"probex%d",-ENOMEM);
328 return -ENOMEM; 328 return -ENOMEM;
329 } 329 }
@@ -340,7 +340,7 @@ claw_probe(struct ccwgroup_device *cgdev)
340 probe_error(cgdev); 340 probe_error(cgdev);
341 put_device(&cgdev->dev); 341 put_device(&cgdev->dev);
342 printk(KERN_WARNING "add_files failed %s %s Exit Line %d \n", 342 printk(KERN_WARNING "add_files failed %s %s Exit Line %d \n",
343 cgdev->cdev[0]->dev.bus_id,__FUNCTION__,__LINE__); 343 cgdev->cdev[0]->dev.bus_id,__func__,__LINE__);
344 CLAW_DBF_TEXT_(2,setup,"probex%d",rc); 344 CLAW_DBF_TEXT_(2,setup,"probex%d",rc);
345 return rc; 345 return rc;
346 } 346 }
@@ -351,7 +351,7 @@ claw_probe(struct ccwgroup_device *cgdev)
351 cgdev->dev.driver_data = privptr; 351 cgdev->dev.driver_data = privptr;
352#ifdef FUNCTRACE 352#ifdef FUNCTRACE
353 printk(KERN_INFO "claw:%s exit on line %d, " 353 printk(KERN_INFO "claw:%s exit on line %d, "
354 "rc = 0\n",__FUNCTION__,__LINE__); 354 "rc = 0\n",__func__,__LINE__);
355#endif 355#endif
356 CLAW_DBF_TEXT(2,setup,"prbext 0"); 356 CLAW_DBF_TEXT(2,setup,"prbext 0");
357 357
@@ -371,7 +371,7 @@ claw_tx(struct sk_buff *skb, struct net_device *dev)
371 struct chbk *p_ch; 371 struct chbk *p_ch;
372 372
373#ifdef FUNCTRACE 373#ifdef FUNCTRACE
374 printk(KERN_INFO "%s:%s enter\n",dev->name,__FUNCTION__); 374 printk(KERN_INFO "%s:%s enter\n",dev->name,__func__);
375#endif 375#endif
376 CLAW_DBF_TEXT(4,trace,"claw_tx"); 376 CLAW_DBF_TEXT(4,trace,"claw_tx");
377 p_ch=&privptr->channel[WRITE]; 377 p_ch=&privptr->channel[WRITE];
@@ -381,7 +381,7 @@ claw_tx(struct sk_buff *skb, struct net_device *dev)
381 privptr->stats.tx_dropped++; 381 privptr->stats.tx_dropped++;
382#ifdef FUNCTRACE 382#ifdef FUNCTRACE
383 printk(KERN_INFO "%s: %s() exit on line %d, rc = EIO\n", 383 printk(KERN_INFO "%s: %s() exit on line %d, rc = EIO\n",
384 dev->name,__FUNCTION__, __LINE__); 384 dev->name,__func__, __LINE__);
385#endif 385#endif
386 CLAW_DBF_TEXT_(2,trace,"clawtx%d",-EIO); 386 CLAW_DBF_TEXT_(2,trace,"clawtx%d",-EIO);
387 return -EIO; 387 return -EIO;
@@ -398,7 +398,7 @@ claw_tx(struct sk_buff *skb, struct net_device *dev)
398 spin_unlock_irqrestore(get_ccwdev_lock(p_ch->cdev), saveflags); 398 spin_unlock_irqrestore(get_ccwdev_lock(p_ch->cdev), saveflags);
399#ifdef FUNCTRACE 399#ifdef FUNCTRACE
400 printk(KERN_INFO "%s:%s exit on line %d, rc = %d\n", 400 printk(KERN_INFO "%s:%s exit on line %d, rc = %d\n",
401 dev->name, __FUNCTION__, __LINE__, rc); 401 dev->name, __func__, __LINE__, rc);
402#endif 402#endif
403 CLAW_DBF_TEXT_(4,trace,"clawtx%d",rc); 403 CLAW_DBF_TEXT_(4,trace,"clawtx%d",rc);
404 return rc; 404 return rc;
@@ -460,7 +460,7 @@ claw_pack_skb(struct claw_privbk *privptr)
460#ifdef IOTRACE 460#ifdef IOTRACE
461 printk(KERN_INFO "%s: %s() Packed %d len %d\n", 461 printk(KERN_INFO "%s: %s() Packed %d len %d\n",
462 p_env->ndev->name, 462 p_env->ndev->name,
463 __FUNCTION__,pkt_cnt,new_skb->len); 463 __func__,pkt_cnt,new_skb->len);
464#endif 464#endif
465 } 465 }
466 CLAW_DBF_TEXT(4,trace,"PackSKBx"); 466 CLAW_DBF_TEXT(4,trace,"PackSKBx");
@@ -478,7 +478,7 @@ claw_change_mtu(struct net_device *dev, int new_mtu)
478 struct claw_privbk *privptr=dev->priv; 478 struct claw_privbk *privptr=dev->priv;
479 int buff_size; 479 int buff_size;
480#ifdef FUNCTRACE 480#ifdef FUNCTRACE
481 printk(KERN_INFO "%s:%s Enter \n",dev->name,__FUNCTION__); 481 printk(KERN_INFO "%s:%s Enter \n",dev->name,__func__);
482#endif 482#endif
483#ifdef DEBUGMSG 483#ifdef DEBUGMSG
484 printk(KERN_INFO "variable dev =\n"); 484 printk(KERN_INFO "variable dev =\n");
@@ -491,14 +491,14 @@ claw_change_mtu(struct net_device *dev, int new_mtu)
491#ifdef FUNCTRACE 491#ifdef FUNCTRACE
492 printk(KERN_INFO "%s:%s Exit on line %d, rc=EINVAL\n", 492 printk(KERN_INFO "%s:%s Exit on line %d, rc=EINVAL\n",
493 dev->name, 493 dev->name,
494 __FUNCTION__, __LINE__); 494 __func__, __LINE__);
495#endif 495#endif
496 return -EINVAL; 496 return -EINVAL;
497 } 497 }
498 dev->mtu = new_mtu; 498 dev->mtu = new_mtu;
499#ifdef FUNCTRACE 499#ifdef FUNCTRACE
500 printk(KERN_INFO "%s:%s Exit on line %d\n",dev->name, 500 printk(KERN_INFO "%s:%s Exit on line %d\n",dev->name,
501 __FUNCTION__, __LINE__); 501 __func__, __LINE__);
502#endif 502#endif
503 return 0; 503 return 0;
504} /* end of claw_change_mtu */ 504} /* end of claw_change_mtu */
@@ -522,7 +522,7 @@ claw_open(struct net_device *dev)
522 struct ccwbk *p_buf; 522 struct ccwbk *p_buf;
523 523
524#ifdef FUNCTRACE 524#ifdef FUNCTRACE
525 printk(KERN_INFO "%s:%s Enter \n",dev->name,__FUNCTION__); 525 printk(KERN_INFO "%s:%s Enter \n",dev->name,__func__);
526#endif 526#endif
527 CLAW_DBF_TEXT(4,trace,"open"); 527 CLAW_DBF_TEXT(4,trace,"open");
528 if (!dev || (dev->name[0] == 0x00)) { 528 if (!dev || (dev->name[0] == 0x00)) {
@@ -537,7 +537,7 @@ claw_open(struct net_device *dev)
537 if (rc) { 537 if (rc) {
538 printk(KERN_INFO "%s:%s Exit on line %d, rc=ENOMEM\n", 538 printk(KERN_INFO "%s:%s Exit on line %d, rc=ENOMEM\n",
539 dev->name, 539 dev->name,
540 __FUNCTION__, __LINE__); 540 __func__, __LINE__);
541 CLAW_DBF_TEXT(2,trace,"openmem"); 541 CLAW_DBF_TEXT(2,trace,"openmem");
542 return -ENOMEM; 542 return -ENOMEM;
543 } 543 }
@@ -661,7 +661,7 @@ claw_open(struct net_device *dev)
661 claw_clear_busy(dev); 661 claw_clear_busy(dev);
662#ifdef FUNCTRACE 662#ifdef FUNCTRACE
663 printk(KERN_INFO "%s:%s Exit on line %d, rc=EIO\n", 663 printk(KERN_INFO "%s:%s Exit on line %d, rc=EIO\n",
664 dev->name,__FUNCTION__,__LINE__); 664 dev->name,__func__,__LINE__);
665#endif 665#endif
666 CLAW_DBF_TEXT(2,trace,"open EIO"); 666 CLAW_DBF_TEXT(2,trace,"open EIO");
667 return -EIO; 667 return -EIO;
@@ -673,7 +673,7 @@ claw_open(struct net_device *dev)
673 673
674#ifdef FUNCTRACE 674#ifdef FUNCTRACE
675 printk(KERN_INFO "%s:%s Exit on line %d, rc=0\n", 675 printk(KERN_INFO "%s:%s Exit on line %d, rc=0\n",
676 dev->name,__FUNCTION__,__LINE__); 676 dev->name,__func__,__LINE__);
677#endif 677#endif
678 CLAW_DBF_TEXT(4,trace,"openok"); 678 CLAW_DBF_TEXT(4,trace,"openok");
679 return 0; 679 return 0;
@@ -696,7 +696,7 @@ claw_irq_handler(struct ccw_device *cdev,
696 696
697 697
698#ifdef FUNCTRACE 698#ifdef FUNCTRACE
699 printk(KERN_INFO "%s enter \n",__FUNCTION__); 699 printk(KERN_INFO "%s enter \n",__func__);
700#endif 700#endif
701 CLAW_DBF_TEXT(4,trace,"clawirq"); 701 CLAW_DBF_TEXT(4,trace,"clawirq");
702 /* Bypass all 'unsolicited interrupts' */ 702 /* Bypass all 'unsolicited interrupts' */
@@ -706,7 +706,7 @@ claw_irq_handler(struct ccw_device *cdev,
706 cdev->dev.bus_id,irb->scsw.cstat, irb->scsw.dstat); 706 cdev->dev.bus_id,irb->scsw.cstat, irb->scsw.dstat);
707#ifdef FUNCTRACE 707#ifdef FUNCTRACE
708 printk(KERN_INFO "claw: %s() " 708 printk(KERN_INFO "claw: %s() "
709 "exit on line %d\n",__FUNCTION__,__LINE__); 709 "exit on line %d\n",__func__,__LINE__);
710#endif 710#endif
711 CLAW_DBF_TEXT(2,trace,"badirq"); 711 CLAW_DBF_TEXT(2,trace,"badirq");
712 return; 712 return;
@@ -752,7 +752,7 @@ claw_irq_handler(struct ccw_device *cdev,
752#endif 752#endif
753#ifdef FUNCTRACE 753#ifdef FUNCTRACE
754 printk(KERN_INFO "%s:%s Exit on line %d\n", 754 printk(KERN_INFO "%s:%s Exit on line %d\n",
755 dev->name,__FUNCTION__,__LINE__); 755 dev->name,__func__,__LINE__);
756#endif 756#endif
757 CLAW_DBF_TEXT(2,trace,"chanchk"); 757 CLAW_DBF_TEXT(2,trace,"chanchk");
758 /* return; */ 758 /* return; */
@@ -777,7 +777,7 @@ claw_irq_handler(struct ccw_device *cdev,
777 (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) { 777 (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) {
778#ifdef FUNCTRACE 778#ifdef FUNCTRACE
779 printk(KERN_INFO "%s:%s Exit on line %d\n", 779 printk(KERN_INFO "%s:%s Exit on line %d\n",
780 dev->name,__FUNCTION__,__LINE__); 780 dev->name,__func__,__LINE__);
781#endif 781#endif
782 return; 782 return;
783 } 783 }
@@ -788,7 +788,7 @@ claw_irq_handler(struct ccw_device *cdev,
788#endif 788#endif
789#ifdef FUNCTRACE 789#ifdef FUNCTRACE
790 printk(KERN_INFO "%s:%s Exit on line %d\n", 790 printk(KERN_INFO "%s:%s Exit on line %d\n",
791 dev->name,__FUNCTION__,__LINE__); 791 dev->name,__func__,__LINE__);
792#endif 792#endif
793 CLAW_DBF_TEXT(4,trace,"stop"); 793 CLAW_DBF_TEXT(4,trace,"stop");
794 return; 794 return;
@@ -804,7 +804,7 @@ claw_irq_handler(struct ccw_device *cdev,
804 (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) { 804 (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) {
805#ifdef FUNCTRACE 805#ifdef FUNCTRACE
806 printk(KERN_INFO "%s:%s Exit on line %d\n", 806 printk(KERN_INFO "%s:%s Exit on line %d\n",
807 dev->name,__FUNCTION__,__LINE__); 807 dev->name,__func__,__LINE__);
808#endif 808#endif
809 CLAW_DBF_TEXT(4,trace,"haltio"); 809 CLAW_DBF_TEXT(4,trace,"haltio");
810 return; 810 return;
@@ -838,7 +838,7 @@ claw_irq_handler(struct ccw_device *cdev,
838#endif 838#endif
839#ifdef FUNCTRACE 839#ifdef FUNCTRACE
840 printk(KERN_INFO "%s:%s Exit on line %d\n", 840 printk(KERN_INFO "%s:%s Exit on line %d\n",
841 dev->name,__FUNCTION__,__LINE__); 841 dev->name,__func__,__LINE__);
842#endif 842#endif
843 CLAW_DBF_TEXT(4,trace,"haltio"); 843 CLAW_DBF_TEXT(4,trace,"haltio");
844 return; 844 return;
@@ -858,7 +858,7 @@ claw_irq_handler(struct ccw_device *cdev,
858 } 858 }
859#ifdef FUNCTRACE 859#ifdef FUNCTRACE
860 printk(KERN_INFO "%s:%s Exit on line %d\n", 860 printk(KERN_INFO "%s:%s Exit on line %d\n",
861 dev->name,__FUNCTION__,__LINE__); 861 dev->name,__func__,__LINE__);
862#endif 862#endif
863 CLAW_DBF_TEXT(4,trace,"notrdy"); 863 CLAW_DBF_TEXT(4,trace,"notrdy");
864 return; 864 return;
@@ -874,7 +874,7 @@ claw_irq_handler(struct ccw_device *cdev,
874 } 874 }
875#ifdef FUNCTRACE 875#ifdef FUNCTRACE
876 printk(KERN_INFO "%s:%s Exit on line %d\n", 876 printk(KERN_INFO "%s:%s Exit on line %d\n",
877 dev->name,__FUNCTION__,__LINE__); 877 dev->name,__func__,__LINE__);
878#endif 878#endif
879 CLAW_DBF_TEXT(4,trace,"PCI_read"); 879 CLAW_DBF_TEXT(4,trace,"PCI_read");
880 return; 880 return;
@@ -885,7 +885,7 @@ claw_irq_handler(struct ccw_device *cdev,
885 (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) { 885 (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) {
886#ifdef FUNCTRACE 886#ifdef FUNCTRACE
887 printk(KERN_INFO "%s:%s Exit on line %d\n", 887 printk(KERN_INFO "%s:%s Exit on line %d\n",
888 dev->name,__FUNCTION__,__LINE__); 888 dev->name,__func__,__LINE__);
889#endif 889#endif
890 CLAW_DBF_TEXT(4,trace,"SPend_rd"); 890 CLAW_DBF_TEXT(4,trace,"SPend_rd");
891 return; 891 return;
@@ -906,7 +906,7 @@ claw_irq_handler(struct ccw_device *cdev,
906#endif 906#endif
907#ifdef FUNCTRACE 907#ifdef FUNCTRACE
908 printk(KERN_INFO "%s:%s Exit on line %d\n", 908 printk(KERN_INFO "%s:%s Exit on line %d\n",
909 dev->name,__FUNCTION__,__LINE__); 909 dev->name,__func__,__LINE__);
910#endif 910#endif
911 CLAW_DBF_TEXT(4,trace,"RdIRQXit"); 911 CLAW_DBF_TEXT(4,trace,"RdIRQXit");
912 return; 912 return;
@@ -929,7 +929,7 @@ claw_irq_handler(struct ccw_device *cdev,
929 } 929 }
930#ifdef FUNCTRACE 930#ifdef FUNCTRACE
931 printk(KERN_INFO "%s:%s Exit on line %d\n", 931 printk(KERN_INFO "%s:%s Exit on line %d\n",
932 dev->name,__FUNCTION__,__LINE__); 932 dev->name,__func__,__LINE__);
933#endif 933#endif
934 CLAW_DBF_TEXT(4,trace,"rstrtwrt"); 934 CLAW_DBF_TEXT(4,trace,"rstrtwrt");
935 return; 935 return;
@@ -946,7 +946,7 @@ claw_irq_handler(struct ccw_device *cdev,
946 (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) { 946 (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) {
947#ifdef FUNCTRACE 947#ifdef FUNCTRACE
948 printk(KERN_INFO "%s:%s Exit on line %d\n", 948 printk(KERN_INFO "%s:%s Exit on line %d\n",
949 dev->name,__FUNCTION__,__LINE__); 949 dev->name,__func__,__LINE__);
950#endif 950#endif
951 CLAW_DBF_TEXT(4,trace,"writeUE"); 951 CLAW_DBF_TEXT(4,trace,"writeUE");
952 return; 952 return;
@@ -969,7 +969,7 @@ claw_irq_handler(struct ccw_device *cdev,
969#endif 969#endif
970#ifdef FUNCTRACE 970#ifdef FUNCTRACE
971 printk(KERN_INFO "%s:%s Exit on line %d\n", 971 printk(KERN_INFO "%s:%s Exit on line %d\n",
972 dev->name,__FUNCTION__,__LINE__); 972 dev->name,__func__,__LINE__);
973#endif 973#endif
974 CLAW_DBF_TEXT(4,trace,"StWtExit"); 974 CLAW_DBF_TEXT(4,trace,"StWtExit");
975 return; 975 return;
@@ -978,7 +978,7 @@ claw_irq_handler(struct ccw_device *cdev,
978 "state=%d\n",dev->name,p_ch->claw_state); 978 "state=%d\n",dev->name,p_ch->claw_state);
979#ifdef FUNCTRACE 979#ifdef FUNCTRACE
980 printk(KERN_INFO "%s:%s Exit on line %d\n", 980 printk(KERN_INFO "%s:%s Exit on line %d\n",
981 dev->name,__FUNCTION__,__LINE__); 981 dev->name,__func__,__LINE__);
982#endif 982#endif
983 CLAW_DBF_TEXT(2,trace,"badIRQ"); 983 CLAW_DBF_TEXT(2,trace,"badIRQ");
984 return; 984 return;
@@ -1001,7 +1001,7 @@ claw_irq_tasklet ( unsigned long data )
1001 p_ch = (struct chbk *) data; 1001 p_ch = (struct chbk *) data;
1002 dev = (struct net_device *)p_ch->ndev; 1002 dev = (struct net_device *)p_ch->ndev;
1003#ifdef FUNCTRACE 1003#ifdef FUNCTRACE
1004 printk(KERN_INFO "%s:%s Enter \n",dev->name,__FUNCTION__); 1004 printk(KERN_INFO "%s:%s Enter \n",dev->name,__func__);
1005#endif 1005#endif
1006#ifdef DEBUGMSG 1006#ifdef DEBUGMSG
1007 printk(KERN_INFO "%s: variable p_ch =\n",dev->name); 1007 printk(KERN_INFO "%s: variable p_ch =\n",dev->name);
@@ -1021,7 +1021,7 @@ claw_irq_tasklet ( unsigned long data )
1021 CLAW_DBF_TEXT(4,trace,"TskletXt"); 1021 CLAW_DBF_TEXT(4,trace,"TskletXt");
1022#ifdef FUNCTRACE 1022#ifdef FUNCTRACE
1023 printk(KERN_INFO "%s:%s Exit on line %d\n", 1023 printk(KERN_INFO "%s:%s Exit on line %d\n",
1024 dev->name,__FUNCTION__,__LINE__); 1024 dev->name,__func__,__LINE__);
1025#endif 1025#endif
1026 return; 1026 return;
1027} /* end of claw_irq_bh */ 1027} /* end of claw_irq_bh */
@@ -1048,7 +1048,7 @@ claw_release(struct net_device *dev)
1048 if (!privptr) 1048 if (!privptr)
1049 return 0; 1049 return 0;
1050#ifdef FUNCTRACE 1050#ifdef FUNCTRACE
1051 printk(KERN_INFO "%s:%s Enter \n",dev->name,__FUNCTION__); 1051 printk(KERN_INFO "%s:%s Enter \n",dev->name,__func__);
1052#endif 1052#endif
1053 CLAW_DBF_TEXT(4,trace,"release"); 1053 CLAW_DBF_TEXT(4,trace,"release");
1054#ifdef DEBUGMSG 1054#ifdef DEBUGMSG
@@ -1090,7 +1090,7 @@ claw_release(struct net_device *dev)
1090 if(privptr->buffs_alloc != 1) { 1090 if(privptr->buffs_alloc != 1) {
1091#ifdef FUNCTRACE 1091#ifdef FUNCTRACE
1092 printk(KERN_INFO "%s:%s Exit on line %d\n", 1092 printk(KERN_INFO "%s:%s Exit on line %d\n",
1093 dev->name,__FUNCTION__,__LINE__); 1093 dev->name,__func__,__LINE__);
1094#endif 1094#endif
1095 CLAW_DBF_TEXT(4,trace,"none2fre"); 1095 CLAW_DBF_TEXT(4,trace,"none2fre");
1096 return 0; 1096 return 0;
@@ -1171,7 +1171,7 @@ claw_release(struct net_device *dev)
1171 } 1171 }
1172#ifdef FUNCTRACE 1172#ifdef FUNCTRACE
1173 printk(KERN_INFO "%s:%s Exit on line %d\n", 1173 printk(KERN_INFO "%s:%s Exit on line %d\n",
1174 dev->name,__FUNCTION__,__LINE__); 1174 dev->name,__func__,__LINE__);
1175#endif 1175#endif
1176 CLAW_DBF_TEXT(4,trace,"rlsexit"); 1176 CLAW_DBF_TEXT(4,trace,"rlsexit");
1177 return 0; 1177 return 0;
@@ -1192,7 +1192,7 @@ claw_write_retry ( struct chbk *p_ch )
1192 1192
1193 1193
1194#ifdef FUNCTRACE 1194#ifdef FUNCTRACE
1195 printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__); 1195 printk(KERN_INFO "%s:%s Enter\n",dev->name,__func__);
1196 printk(KERN_INFO "claw: variable p_ch =\n"); 1196 printk(KERN_INFO "claw: variable p_ch =\n");
1197 dumpit((char *) p_ch, sizeof(struct chbk)); 1197 dumpit((char *) p_ch, sizeof(struct chbk));
1198#endif 1198#endif
@@ -1200,20 +1200,20 @@ claw_write_retry ( struct chbk *p_ch )
1200 if (p_ch->claw_state == CLAW_STOP) { 1200 if (p_ch->claw_state == CLAW_STOP) {
1201#ifdef FUNCTRACE 1201#ifdef FUNCTRACE
1202 printk(KERN_INFO "%s:%s Exit on line %d\n", 1202 printk(KERN_INFO "%s:%s Exit on line %d\n",
1203 dev->name,__FUNCTION__,__LINE__); 1203 dev->name,__func__,__LINE__);
1204#endif 1204#endif
1205 return; 1205 return;
1206 } 1206 }
1207#ifdef DEBUGMSG 1207#ifdef DEBUGMSG
1208 printk( KERN_INFO "%s:%s state-%02x\n" , 1208 printk( KERN_INFO "%s:%s state-%02x\n" ,
1209 dev->name, 1209 dev->name,
1210 __FUNCTION__, 1210 __func__,
1211 p_ch->claw_state); 1211 p_ch->claw_state);
1212#endif 1212#endif
1213 claw_strt_out_IO( dev ); 1213 claw_strt_out_IO( dev );
1214#ifdef FUNCTRACE 1214#ifdef FUNCTRACE
1215 printk(KERN_INFO "%s:%s Exit on line %d\n", 1215 printk(KERN_INFO "%s:%s Exit on line %d\n",
1216 dev->name,__FUNCTION__,__LINE__); 1216 dev->name,__func__,__LINE__);
1217#endif 1217#endif
1218 CLAW_DBF_TEXT(4,trace,"rtry_xit"); 1218 CLAW_DBF_TEXT(4,trace,"rtry_xit");
1219 return; 1219 return;
@@ -1235,7 +1235,7 @@ claw_write_next ( struct chbk * p_ch )
1235 int rc; 1235 int rc;
1236 1236
1237#ifdef FUNCTRACE 1237#ifdef FUNCTRACE
1238 printk(KERN_INFO "%s:%s Enter \n",p_ch->ndev->name,__FUNCTION__); 1238 printk(KERN_INFO "%s:%s Enter \n",p_ch->ndev->name,__func__);
1239 printk(KERN_INFO "%s: variable p_ch =\n",p_ch->ndev->name); 1239 printk(KERN_INFO "%s: variable p_ch =\n",p_ch->ndev->name);
1240 dumpit((char *) p_ch, sizeof(struct chbk)); 1240 dumpit((char *) p_ch, sizeof(struct chbk));
1241#endif 1241#endif
@@ -1262,7 +1262,7 @@ claw_write_next ( struct chbk * p_ch )
1262 1262
1263#ifdef FUNCTRACE 1263#ifdef FUNCTRACE
1264 printk(KERN_INFO "%s:%s Exit on line %d\n", 1264 printk(KERN_INFO "%s:%s Exit on line %d\n",
1265 dev->name,__FUNCTION__,__LINE__); 1265 dev->name,__func__,__LINE__);
1266#endif 1266#endif
1267 return; 1267 return;
1268} /* end of claw_write_next */ 1268} /* end of claw_write_next */
@@ -1276,7 +1276,7 @@ static void
1276claw_timer ( struct chbk * p_ch ) 1276claw_timer ( struct chbk * p_ch )
1277{ 1277{
1278#ifdef FUNCTRACE 1278#ifdef FUNCTRACE
1279 printk(KERN_INFO "%s:%s Entry\n",p_ch->ndev->name,__FUNCTION__); 1279 printk(KERN_INFO "%s:%s Entry\n",p_ch->ndev->name,__func__);
1280 printk(KERN_INFO "%s: variable p_ch =\n",p_ch->ndev->name); 1280 printk(KERN_INFO "%s: variable p_ch =\n",p_ch->ndev->name);
1281 dumpit((char *) p_ch, sizeof(struct chbk)); 1281 dumpit((char *) p_ch, sizeof(struct chbk));
1282#endif 1282#endif
@@ -1285,7 +1285,7 @@ claw_timer ( struct chbk * p_ch )
1285 wake_up(&p_ch->wait); 1285 wake_up(&p_ch->wait);
1286#ifdef FUNCTRACE 1286#ifdef FUNCTRACE
1287 printk(KERN_INFO "%s:%s Exit on line %d\n", 1287 printk(KERN_INFO "%s:%s Exit on line %d\n",
1288 p_ch->ndev->name,__FUNCTION__,__LINE__); 1288 p_ch->ndev->name,__func__,__LINE__);
1289#endif 1289#endif
1290 return; 1290 return;
1291} /* end of claw_timer */ 1291} /* end of claw_timer */
@@ -1312,7 +1312,7 @@ pages_to_order_of_mag(int num_of_pages)
1312 int order_of_mag=1; /* assume 2 pages */ 1312 int order_of_mag=1; /* assume 2 pages */
1313 int nump=2; 1313 int nump=2;
1314#ifdef FUNCTRACE 1314#ifdef FUNCTRACE
1315 printk(KERN_INFO "%s Enter pages = %d \n",__FUNCTION__,num_of_pages); 1315 printk(KERN_INFO "%s Enter pages = %d \n",__func__,num_of_pages);
1316#endif 1316#endif
1317 CLAW_DBF_TEXT_(5,trace,"pages%d",num_of_pages); 1317 CLAW_DBF_TEXT_(5,trace,"pages%d",num_of_pages);
1318 if (num_of_pages == 1) {return 0; } /* magnitude of 0 = 1 page */ 1318 if (num_of_pages == 1) {return 0; } /* magnitude of 0 = 1 page */
@@ -1327,7 +1327,7 @@ pages_to_order_of_mag(int num_of_pages)
1327 if (order_of_mag > 9) { order_of_mag = 9; } /* I know it's paranoid */ 1327 if (order_of_mag > 9) { order_of_mag = 9; } /* I know it's paranoid */
1328#ifdef FUNCTRACE 1328#ifdef FUNCTRACE
1329 printk(KERN_INFO "%s Exit on line %d, order = %d\n", 1329 printk(KERN_INFO "%s Exit on line %d, order = %d\n",
1330 __FUNCTION__,__LINE__, order_of_mag); 1330 __func__,__LINE__, order_of_mag);
1331#endif 1331#endif
1332 CLAW_DBF_TEXT_(5,trace,"mag%d",order_of_mag); 1332 CLAW_DBF_TEXT_(5,trace,"mag%d",order_of_mag);
1333 return order_of_mag; 1333 return order_of_mag;
@@ -1349,7 +1349,7 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first,
1349 struct ccwbk* p_buf; 1349 struct ccwbk* p_buf;
1350#endif 1350#endif
1351#ifdef FUNCTRACE 1351#ifdef FUNCTRACE
1352 printk(KERN_INFO "%s:%s Enter \n",dev->name,__FUNCTION__); 1352 printk(KERN_INFO "%s:%s Enter \n",dev->name,__func__);
1353#endif 1353#endif
1354#ifdef DEBUGMSG 1354#ifdef DEBUGMSG
1355 printk(KERN_INFO "dev\n"); 1355 printk(KERN_INFO "dev\n");
@@ -1369,7 +1369,7 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first,
1369 if ( p_first==NULL) { 1369 if ( p_first==NULL) {
1370#ifdef FUNCTRACE 1370#ifdef FUNCTRACE
1371 printk(KERN_INFO "%s:%s Exit on line %d\n", 1371 printk(KERN_INFO "%s:%s Exit on line %d\n",
1372 dev->name,__FUNCTION__,__LINE__); 1372 dev->name,__func__,__LINE__);
1373#endif 1373#endif
1374 CLAW_DBF_TEXT(4,trace,"addexit"); 1374 CLAW_DBF_TEXT(4,trace,"addexit");
1375 return 0; 1375 return 0;
@@ -1400,9 +1400,9 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first,
1400 if ( privptr-> p_read_active_first ==NULL ) { 1400 if ( privptr-> p_read_active_first ==NULL ) {
1401#ifdef DEBUGMSG 1401#ifdef DEBUGMSG
1402 printk(KERN_INFO "%s:%s p_read_active_first == NULL \n", 1402 printk(KERN_INFO "%s:%s p_read_active_first == NULL \n",
1403 dev->name,__FUNCTION__); 1403 dev->name,__func__);
1404 printk(KERN_INFO "%s:%s Read active first/last changed \n", 1404 printk(KERN_INFO "%s:%s Read active first/last changed \n",
1405 dev->name,__FUNCTION__); 1405 dev->name,__func__);
1406#endif 1406#endif
1407 privptr-> p_read_active_first= p_first; /* set new first */ 1407 privptr-> p_read_active_first= p_first; /* set new first */
1408 privptr-> p_read_active_last = p_last; /* set new last */ 1408 privptr-> p_read_active_last = p_last; /* set new last */
@@ -1411,7 +1411,7 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first,
1411 1411
1412#ifdef DEBUGMSG 1412#ifdef DEBUGMSG
1413 printk(KERN_INFO "%s:%s Read in progress \n", 1413 printk(KERN_INFO "%s:%s Read in progress \n",
1414 dev->name,__FUNCTION__); 1414 dev->name,__func__);
1415#endif 1415#endif
1416 /* set up TIC ccw */ 1416 /* set up TIC ccw */
1417 temp_ccw.cda= (__u32)__pa(&p_first->read); 1417 temp_ccw.cda= (__u32)__pa(&p_first->read);
@@ -1450,15 +1450,15 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first,
1450 privptr->p_read_active_last=p_last; 1450 privptr->p_read_active_last=p_last;
1451 } /* end of if ( privptr-> p_read_active_first ==NULL) */ 1451 } /* end of if ( privptr-> p_read_active_first ==NULL) */
1452#ifdef IOTRACE 1452#ifdef IOTRACE
1453 printk(KERN_INFO "%s:%s dump p_last CCW BK \n",dev->name,__FUNCTION__); 1453 printk(KERN_INFO "%s:%s dump p_last CCW BK \n",dev->name,__func__);
1454 dumpit((char *)p_last, sizeof(struct ccwbk)); 1454 dumpit((char *)p_last, sizeof(struct ccwbk));
1455 printk(KERN_INFO "%s:%s dump p_end CCW BK \n",dev->name,__FUNCTION__); 1455 printk(KERN_INFO "%s:%s dump p_end CCW BK \n",dev->name,__func__);
1456 dumpit((char *)p_end, sizeof(struct endccw)); 1456 dumpit((char *)p_end, sizeof(struct endccw));
1457 1457
1458 printk(KERN_INFO "%s:%s dump p_first CCW BK \n",dev->name,__FUNCTION__); 1458 printk(KERN_INFO "%s:%s dump p_first CCW BK \n",dev->name,__func__);
1459 dumpit((char *)p_first, sizeof(struct ccwbk)); 1459 dumpit((char *)p_first, sizeof(struct ccwbk));
1460 printk(KERN_INFO "%s:%s Dump Active CCW chain \n", 1460 printk(KERN_INFO "%s:%s Dump Active CCW chain \n",
1461 dev->name,__FUNCTION__); 1461 dev->name,__func__);
1462 p_buf=privptr->p_read_active_first; 1462 p_buf=privptr->p_read_active_first;
1463 while (p_buf!=NULL) { 1463 while (p_buf!=NULL) {
1464 dumpit((char *)p_buf, sizeof(struct ccwbk)); 1464 dumpit((char *)p_buf, sizeof(struct ccwbk));
@@ -1467,7 +1467,7 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first,
1467#endif 1467#endif
1468#ifdef FUNCTRACE 1468#ifdef FUNCTRACE
1469 printk(KERN_INFO "%s:%s Exit on line %d\n", 1469 printk(KERN_INFO "%s:%s Exit on line %d\n",
1470 dev->name,__FUNCTION__,__LINE__); 1470 dev->name,__func__,__LINE__);
1471#endif 1471#endif
1472 CLAW_DBF_TEXT(4,trace,"addexit"); 1472 CLAW_DBF_TEXT(4,trace,"addexit");
1473 return 0; 1473 return 0;
@@ -1483,7 +1483,7 @@ ccw_check_return_code(struct ccw_device *cdev, int return_code)
1483{ 1483{
1484#ifdef FUNCTRACE 1484#ifdef FUNCTRACE
1485 printk(KERN_INFO "%s: %s() > enter \n", 1485 printk(KERN_INFO "%s: %s() > enter \n",
1486 cdev->dev.bus_id,__FUNCTION__); 1486 cdev->dev.bus_id,__func__);
1487#endif 1487#endif
1488 CLAW_DBF_TEXT(4,trace,"ccwret"); 1488 CLAW_DBF_TEXT(4,trace,"ccwret");
1489#ifdef DEBUGMSG 1489#ifdef DEBUGMSG
@@ -1516,7 +1516,7 @@ ccw_check_return_code(struct ccw_device *cdev, int return_code)
1516 } 1516 }
1517#ifdef FUNCTRACE 1517#ifdef FUNCTRACE
1518 printk(KERN_INFO "%s: %s() > exit on line %d\n", 1518 printk(KERN_INFO "%s: %s() > exit on line %d\n",
1519 cdev->dev.bus_id,__FUNCTION__,__LINE__); 1519 cdev->dev.bus_id,__func__,__LINE__);
1520#endif 1520#endif
1521 CLAW_DBF_TEXT(4,trace,"ccwret"); 1521 CLAW_DBF_TEXT(4,trace,"ccwret");
1522} /* end of ccw_check_return_code */ 1522} /* end of ccw_check_return_code */
@@ -1531,7 +1531,7 @@ ccw_check_unit_check(struct chbk * p_ch, unsigned char sense )
1531 struct net_device *dev = p_ch->ndev; 1531 struct net_device *dev = p_ch->ndev;
1532 1532
1533#ifdef FUNCTRACE 1533#ifdef FUNCTRACE
1534 printk(KERN_INFO "%s: %s() > enter\n",dev->name,__FUNCTION__); 1534 printk(KERN_INFO "%s: %s() > enter\n",dev->name,__func__);
1535#endif 1535#endif
1536#ifdef DEBUGMSG 1536#ifdef DEBUGMSG
1537 printk(KERN_INFO "%s: variable dev =\n",dev->name); 1537 printk(KERN_INFO "%s: variable dev =\n",dev->name);
@@ -1578,7 +1578,7 @@ ccw_check_unit_check(struct chbk * p_ch, unsigned char sense )
1578 1578
1579#ifdef FUNCTRACE 1579#ifdef FUNCTRACE
1580 printk(KERN_INFO "%s: %s() exit on line %d\n", 1580 printk(KERN_INFO "%s: %s() exit on line %d\n",
1581 dev->name,__FUNCTION__,__LINE__); 1581 dev->name,__func__,__LINE__);
1582#endif 1582#endif
1583} /* end of ccw_check_unit_check */ 1583} /* end of ccw_check_unit_check */
1584 1584
@@ -1706,7 +1706,7 @@ find_link(struct net_device *dev, char *host_name, char *ws_name )
1706 int rc=0; 1706 int rc=0;
1707 1707
1708#ifdef FUNCTRACE 1708#ifdef FUNCTRACE
1709 printk(KERN_INFO "%s:%s > enter \n",dev->name,__FUNCTION__); 1709 printk(KERN_INFO "%s:%s > enter \n",dev->name,__func__);
1710#endif 1710#endif
1711 CLAW_DBF_TEXT(2,setup,"findlink"); 1711 CLAW_DBF_TEXT(2,setup,"findlink");
1712#ifdef DEBUGMSG 1712#ifdef DEBUGMSG
@@ -1739,7 +1739,7 @@ find_link(struct net_device *dev, char *host_name, char *ws_name )
1739 1739
1740#ifdef FUNCTRACE 1740#ifdef FUNCTRACE
1741 printk(KERN_INFO "%s:%s Exit on line %d\n", 1741 printk(KERN_INFO "%s:%s Exit on line %d\n",
1742 dev->name,__FUNCTION__,__LINE__); 1742 dev->name,__func__,__LINE__);
1743#endif 1743#endif
1744 return 0; 1744 return 0;
1745} /* end of find_link */ 1745} /* end of find_link */
@@ -1773,7 +1773,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
1773 struct ccwbk *p_buf; 1773 struct ccwbk *p_buf;
1774#endif 1774#endif
1775#ifdef FUNCTRACE 1775#ifdef FUNCTRACE
1776 printk(KERN_INFO "%s: %s() > enter\n",dev->name,__FUNCTION__); 1776 printk(KERN_INFO "%s: %s() > enter\n",dev->name,__func__);
1777#endif 1777#endif
1778 CLAW_DBF_TEXT(4,trace,"hw_tx"); 1778 CLAW_DBF_TEXT(4,trace,"hw_tx");
1779#ifdef DEBUGMSG 1779#ifdef DEBUGMSG
@@ -1787,7 +1787,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
1787 p_ch=(struct chbk *)&privptr->channel[WRITE]; 1787 p_ch=(struct chbk *)&privptr->channel[WRITE];
1788 p_env =privptr->p_env; 1788 p_env =privptr->p_env;
1789#ifdef IOTRACE 1789#ifdef IOTRACE
1790 printk(KERN_INFO "%s: %s() dump sk_buff \n",dev->name,__FUNCTION__); 1790 printk(KERN_INFO "%s: %s() dump sk_buff \n",dev->name,__func__);
1791 dumpit((char *)skb ,sizeof(struct sk_buff)); 1791 dumpit((char *)skb ,sizeof(struct sk_buff));
1792#endif 1792#endif
1793 claw_free_wrt_buf(dev); /* Clean up free chain if posible */ 1793 claw_free_wrt_buf(dev); /* Clean up free chain if posible */
@@ -1877,7 +1877,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
1877 while (len_of_data > 0) { 1877 while (len_of_data > 0) {
1878#ifdef DEBUGMSG 1878#ifdef DEBUGMSG
1879 printk(KERN_INFO "%s: %s() length-of-data is %ld \n", 1879 printk(KERN_INFO "%s: %s() length-of-data is %ld \n",
1880 dev->name ,__FUNCTION__,len_of_data); 1880 dev->name ,__func__,len_of_data);
1881 dumpit((char *)pDataAddress ,64); 1881 dumpit((char *)pDataAddress ,64);
1882#endif 1882#endif
1883 p_this_ccw=privptr->p_write_free_chain; /* get a block */ 1883 p_this_ccw=privptr->p_write_free_chain; /* get a block */
@@ -1913,7 +1913,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
1913 p_last_ccw=p_this_ccw; /* save new last block */ 1913 p_last_ccw=p_this_ccw; /* save new last block */
1914#ifdef IOTRACE 1914#ifdef IOTRACE
1915 printk(KERN_INFO "%s: %s() > CCW and Buffer %ld bytes long \n", 1915 printk(KERN_INFO "%s: %s() > CCW and Buffer %ld bytes long \n",
1916 dev->name,__FUNCTION__,bytesInThisBuffer); 1916 dev->name,__func__,bytesInThisBuffer);
1917 dumpit((char *)p_this_ccw, sizeof(struct ccwbk)); 1917 dumpit((char *)p_this_ccw, sizeof(struct ccwbk));
1918 dumpit((char *)p_this_ccw->p_buffer, 64); 1918 dumpit((char *)p_this_ccw->p_buffer, 64);
1919#endif 1919#endif
@@ -1998,7 +1998,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
1998 1998
1999#ifdef IOTRACE 1999#ifdef IOTRACE
2000 printk(KERN_INFO "%s: %s() > Dump Active CCW chain \n", 2000 printk(KERN_INFO "%s: %s() > Dump Active CCW chain \n",
2001 dev->name,__FUNCTION__); 2001 dev->name,__func__);
2002 p_buf=privptr->p_write_active_first; 2002 p_buf=privptr->p_write_active_first;
2003 while (p_buf!=NULL) { 2003 while (p_buf!=NULL) {
2004 dumpit((char *)p_buf, sizeof(struct ccwbk)); 2004 dumpit((char *)p_buf, sizeof(struct ccwbk));
@@ -2018,7 +2018,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
2018 /* if write free count is zero , set NOBUFFER */ 2018 /* if write free count is zero , set NOBUFFER */
2019#ifdef DEBUGMSG 2019#ifdef DEBUGMSG
2020 printk(KERN_INFO "%s: %s() > free_count is %d\n", 2020 printk(KERN_INFO "%s: %s() > free_count is %d\n",
2021 dev->name,__FUNCTION__, 2021 dev->name,__func__,
2022 (int) privptr->write_free_count ); 2022 (int) privptr->write_free_count );
2023#endif 2023#endif
2024 if (privptr->write_free_count==0) { 2024 if (privptr->write_free_count==0) {
@@ -2029,7 +2029,7 @@ Done2:
2029Done: 2029Done:
2030#ifdef FUNCTRACE 2030#ifdef FUNCTRACE
2031 printk(KERN_INFO "%s: %s() > exit on line %d, rc = %d \n", 2031 printk(KERN_INFO "%s: %s() > exit on line %d, rc = %d \n",
2032 dev->name,__FUNCTION__,__LINE__, rc); 2032 dev->name,__func__,__LINE__, rc);
2033#endif 2033#endif
2034 return(rc); 2034 return(rc);
2035} /* end of claw_hw_tx */ 2035} /* end of claw_hw_tx */
@@ -2063,7 +2063,7 @@ init_ccw_bk(struct net_device *dev)
2063 addr_t real_TIC_address; 2063 addr_t real_TIC_address;
2064 int i,j; 2064 int i,j;
2065#ifdef FUNCTRACE 2065#ifdef FUNCTRACE
2066 printk(KERN_INFO "%s: %s() enter \n",dev->name,__FUNCTION__); 2066 printk(KERN_INFO "%s: %s() enter \n",dev->name,__func__);
2067#endif 2067#endif
2068 CLAW_DBF_TEXT(4,trace,"init_ccw"); 2068 CLAW_DBF_TEXT(4,trace,"init_ccw");
2069#ifdef DEBUGMSG 2069#ifdef DEBUGMSG
@@ -2097,15 +2097,15 @@ init_ccw_bk(struct net_device *dev)
2097#ifdef DEBUGMSG 2097#ifdef DEBUGMSG
2098 printk(KERN_INFO "%s: %s() " 2098 printk(KERN_INFO "%s: %s() "
2099 "ccw_blocks_required=%d\n", 2099 "ccw_blocks_required=%d\n",
2100 dev->name,__FUNCTION__, 2100 dev->name,__func__,
2101 ccw_blocks_required); 2101 ccw_blocks_required);
2102 printk(KERN_INFO "%s: %s() " 2102 printk(KERN_INFO "%s: %s() "
2103 "PAGE_SIZE=0x%x\n", 2103 "PAGE_SIZE=0x%x\n",
2104 dev->name,__FUNCTION__, 2104 dev->name,__func__,
2105 (unsigned int)PAGE_SIZE); 2105 (unsigned int)PAGE_SIZE);
2106 printk(KERN_INFO "%s: %s() > " 2106 printk(KERN_INFO "%s: %s() > "
2107 "PAGE_MASK=0x%x\n", 2107 "PAGE_MASK=0x%x\n",
2108 dev->name,__FUNCTION__, 2108 dev->name,__func__,
2109 (unsigned int)PAGE_MASK); 2109 (unsigned int)PAGE_MASK);
2110#endif 2110#endif
2111 /* 2111 /*
@@ -2117,10 +2117,10 @@ init_ccw_bk(struct net_device *dev)
2117 2117
2118#ifdef DEBUGMSG 2118#ifdef DEBUGMSG
2119 printk(KERN_INFO "%s: %s() > ccw_blocks_perpage=%d\n", 2119 printk(KERN_INFO "%s: %s() > ccw_blocks_perpage=%d\n",
2120 dev->name,__FUNCTION__, 2120 dev->name,__func__,
2121 ccw_blocks_perpage); 2121 ccw_blocks_perpage);
2122 printk(KERN_INFO "%s: %s() > ccw_pages_required=%d\n", 2122 printk(KERN_INFO "%s: %s() > ccw_pages_required=%d\n",
2123 dev->name,__FUNCTION__, 2123 dev->name,__func__,
2124 ccw_pages_required); 2124 ccw_pages_required);
2125#endif 2125#endif
2126 /* 2126 /*
@@ -2156,29 +2156,29 @@ init_ccw_bk(struct net_device *dev)
2156#ifdef DEBUGMSG 2156#ifdef DEBUGMSG
2157 if (privptr->p_env->read_size < PAGE_SIZE) { 2157 if (privptr->p_env->read_size < PAGE_SIZE) {
2158 printk(KERN_INFO "%s: %s() reads_perpage=%d\n", 2158 printk(KERN_INFO "%s: %s() reads_perpage=%d\n",
2159 dev->name,__FUNCTION__, 2159 dev->name,__func__,
2160 claw_reads_perpage); 2160 claw_reads_perpage);
2161 } 2161 }
2162 else { 2162 else {
2163 printk(KERN_INFO "%s: %s() pages_perread=%d\n", 2163 printk(KERN_INFO "%s: %s() pages_perread=%d\n",
2164 dev->name,__FUNCTION__, 2164 dev->name,__func__,
2165 privptr->p_buff_pages_perread); 2165 privptr->p_buff_pages_perread);
2166 } 2166 }
2167 printk(KERN_INFO "%s: %s() read_pages=%d\n", 2167 printk(KERN_INFO "%s: %s() read_pages=%d\n",
2168 dev->name,__FUNCTION__, 2168 dev->name,__func__,
2169 claw_read_pages); 2169 claw_read_pages);
2170 if (privptr->p_env->write_size < PAGE_SIZE) { 2170 if (privptr->p_env->write_size < PAGE_SIZE) {
2171 printk(KERN_INFO "%s: %s() writes_perpage=%d\n", 2171 printk(KERN_INFO "%s: %s() writes_perpage=%d\n",
2172 dev->name,__FUNCTION__, 2172 dev->name,__func__,
2173 claw_writes_perpage); 2173 claw_writes_perpage);
2174 } 2174 }
2175 else { 2175 else {
2176 printk(KERN_INFO "%s: %s() pages_perwrite=%d\n", 2176 printk(KERN_INFO "%s: %s() pages_perwrite=%d\n",
2177 dev->name,__FUNCTION__, 2177 dev->name,__func__,
2178 privptr->p_buff_pages_perwrite); 2178 privptr->p_buff_pages_perwrite);
2179 } 2179 }
2180 printk(KERN_INFO "%s: %s() write_pages=%d\n", 2180 printk(KERN_INFO "%s: %s() write_pages=%d\n",
2181 dev->name,__FUNCTION__, 2181 dev->name,__func__,
2182 claw_write_pages); 2182 claw_write_pages);
2183#endif 2183#endif
2184 2184
@@ -2194,12 +2194,12 @@ init_ccw_bk(struct net_device *dev)
2194 printk(KERN_INFO "%s: %s() " 2194 printk(KERN_INFO "%s: %s() "
2195 "__get_free_pages for CCWs failed : " 2195 "__get_free_pages for CCWs failed : "
2196 "pages is %d\n", 2196 "pages is %d\n",
2197 dev->name,__FUNCTION__, 2197 dev->name,__func__,
2198 ccw_pages_required ); 2198 ccw_pages_required );
2199#ifdef FUNCTRACE 2199#ifdef FUNCTRACE
2200 printk(KERN_INFO "%s: %s() > " 2200 printk(KERN_INFO "%s: %s() > "
2201 "exit on line %d, rc = ENOMEM\n", 2201 "exit on line %d, rc = ENOMEM\n",
2202 dev->name,__FUNCTION__, 2202 dev->name,__func__,
2203 __LINE__); 2203 __LINE__);
2204#endif 2204#endif
2205 return -ENOMEM; 2205 return -ENOMEM;
@@ -2218,7 +2218,7 @@ init_ccw_bk(struct net_device *dev)
2218 /* Initialize ending CCW block */ 2218 /* Initialize ending CCW block */
2219#ifdef DEBUGMSG 2219#ifdef DEBUGMSG
2220 printk(KERN_INFO "%s: %s() begin initialize ending CCW blocks\n", 2220 printk(KERN_INFO "%s: %s() begin initialize ending CCW blocks\n",
2221 dev->name,__FUNCTION__); 2221 dev->name,__func__);
2222#endif 2222#endif
2223 2223
2224 p_endccw=privptr->p_end_ccw; 2224 p_endccw=privptr->p_end_ccw;
@@ -2276,7 +2276,7 @@ init_ccw_bk(struct net_device *dev)
2276 2276
2277#ifdef IOTRACE 2277#ifdef IOTRACE
2278 printk(KERN_INFO "%s: %s() dump claw ending CCW BK \n", 2278 printk(KERN_INFO "%s: %s() dump claw ending CCW BK \n",
2279 dev->name,__FUNCTION__); 2279 dev->name,__func__);
2280 dumpit((char *)p_endccw, sizeof(struct endccw)); 2280 dumpit((char *)p_endccw, sizeof(struct endccw));
2281#endif 2281#endif
2282 2282
@@ -2287,7 +2287,7 @@ init_ccw_bk(struct net_device *dev)
2287 2287
2288#ifdef DEBUGMSG 2288#ifdef DEBUGMSG
2289 printk(KERN_INFO "%s: %s() Begin build a chain of CCW buffer \n", 2289 printk(KERN_INFO "%s: %s() Begin build a chain of CCW buffer \n",
2290 dev->name,__FUNCTION__); 2290 dev->name,__func__);
2291#endif 2291#endif
2292 p_buff=privptr->p_buff_ccw; 2292 p_buff=privptr->p_buff_ccw;
2293 2293
@@ -2306,7 +2306,7 @@ init_ccw_bk(struct net_device *dev)
2306#ifdef DEBUGMSG 2306#ifdef DEBUGMSG
2307 printk(KERN_INFO "%s: %s() " 2307 printk(KERN_INFO "%s: %s() "
2308 "End build a chain of CCW buffer \n", 2308 "End build a chain of CCW buffer \n",
2309 dev->name,__FUNCTION__); 2309 dev->name,__func__);
2310 p_buf=p_free_chain; 2310 p_buf=p_free_chain;
2311 while (p_buf!=NULL) { 2311 while (p_buf!=NULL) {
2312 dumpit((char *)p_buf, sizeof(struct ccwbk)); 2312 dumpit((char *)p_buf, sizeof(struct ccwbk));
@@ -2321,7 +2321,7 @@ init_ccw_bk(struct net_device *dev)
2321#ifdef DEBUGMSG 2321#ifdef DEBUGMSG
2322 printk(KERN_INFO "%s: %s() " 2322 printk(KERN_INFO "%s: %s() "
2323 "Begin initialize ClawSignalBlock \n", 2323 "Begin initialize ClawSignalBlock \n",
2324 dev->name,__FUNCTION__); 2324 dev->name,__func__);
2325#endif 2325#endif
2326 if (privptr->p_claw_signal_blk==NULL) { 2326 if (privptr->p_claw_signal_blk==NULL) {
2327 privptr->p_claw_signal_blk=p_free_chain; 2327 privptr->p_claw_signal_blk=p_free_chain;
@@ -2334,7 +2334,7 @@ init_ccw_bk(struct net_device *dev)
2334#ifdef DEBUGMSG 2334#ifdef DEBUGMSG
2335 printk(KERN_INFO "%s: %s() > End initialize " 2335 printk(KERN_INFO "%s: %s() > End initialize "
2336 "ClawSignalBlock\n", 2336 "ClawSignalBlock\n",
2337 dev->name,__FUNCTION__); 2337 dev->name,__func__);
2338 dumpit((char *)privptr->p_claw_signal_blk, sizeof(struct ccwbk)); 2338 dumpit((char *)privptr->p_claw_signal_blk, sizeof(struct ccwbk));
2339#endif 2339#endif
2340 2340
@@ -2349,14 +2349,14 @@ init_ccw_bk(struct net_device *dev)
2349 if (privptr->p_buff_write==NULL) { 2349 if (privptr->p_buff_write==NULL) {
2350 printk(KERN_INFO "%s: %s() __get_free_pages for write" 2350 printk(KERN_INFO "%s: %s() __get_free_pages for write"
2351 " bufs failed : get is for %d pages\n", 2351 " bufs failed : get is for %d pages\n",
2352 dev->name,__FUNCTION__,claw_write_pages ); 2352 dev->name,__func__,claw_write_pages );
2353 free_pages((unsigned long)privptr->p_buff_ccw, 2353 free_pages((unsigned long)privptr->p_buff_ccw,
2354 (int)pages_to_order_of_mag(privptr->p_buff_ccw_num)); 2354 (int)pages_to_order_of_mag(privptr->p_buff_ccw_num));
2355 privptr->p_buff_ccw=NULL; 2355 privptr->p_buff_ccw=NULL;
2356#ifdef FUNCTRACE 2356#ifdef FUNCTRACE
2357 printk(KERN_INFO "%s: %s() > exit on line %d," 2357 printk(KERN_INFO "%s: %s() > exit on line %d,"
2358 "rc = ENOMEM\n", 2358 "rc = ENOMEM\n",
2359 dev->name,__FUNCTION__,__LINE__); 2359 dev->name,__func__,__LINE__);
2360#endif 2360#endif
2361 return -ENOMEM; 2361 return -ENOMEM;
2362 } 2362 }
@@ -2369,7 +2369,7 @@ init_ccw_bk(struct net_device *dev)
2369 ccw_pages_required * PAGE_SIZE); 2369 ccw_pages_required * PAGE_SIZE);
2370#ifdef DEBUGMSG 2370#ifdef DEBUGMSG
2371 printk(KERN_INFO "%s: %s() Begin build claw write free " 2371 printk(KERN_INFO "%s: %s() Begin build claw write free "
2372 "chain \n",dev->name,__FUNCTION__); 2372 "chain \n",dev->name,__func__);
2373#endif 2373#endif
2374 privptr->p_write_free_chain=NULL; 2374 privptr->p_write_free_chain=NULL;
2375 2375
@@ -2409,14 +2409,14 @@ init_ccw_bk(struct net_device *dev)
2409#ifdef IOTRACE 2409#ifdef IOTRACE
2410 printk(KERN_INFO "%s:%s __get_free_pages " 2410 printk(KERN_INFO "%s:%s __get_free_pages "
2411 "for writes buf: get for %d pages\n", 2411 "for writes buf: get for %d pages\n",
2412 dev->name,__FUNCTION__, 2412 dev->name,__func__,
2413 privptr->p_buff_pages_perwrite); 2413 privptr->p_buff_pages_perwrite);
2414#endif 2414#endif
2415 if (p_buff==NULL) { 2415 if (p_buff==NULL) {
2416 printk(KERN_INFO "%s:%s __get_free_pages " 2416 printk(KERN_INFO "%s:%s __get_free_pages "
2417 "for writes buf failed : get is for %d pages\n", 2417 "for writes buf failed : get is for %d pages\n",
2418 dev->name, 2418 dev->name,
2419 __FUNCTION__, 2419 __func__,
2420 privptr->p_buff_pages_perwrite ); 2420 privptr->p_buff_pages_perwrite );
2421 free_pages((unsigned long)privptr->p_buff_ccw, 2421 free_pages((unsigned long)privptr->p_buff_ccw,
2422 (int)pages_to_order_of_mag( 2422 (int)pages_to_order_of_mag(
@@ -2433,7 +2433,7 @@ init_ccw_bk(struct net_device *dev)
2433#ifdef FUNCTRACE 2433#ifdef FUNCTRACE
2434 printk(KERN_INFO "%s: %s exit on line %d, rc = ENOMEM\n", 2434 printk(KERN_INFO "%s: %s exit on line %d, rc = ENOMEM\n",
2435 dev->name, 2435 dev->name,
2436 __FUNCTION__, 2436 __func__,
2437 __LINE__); 2437 __LINE__);
2438#endif 2438#endif
2439 return -ENOMEM; 2439 return -ENOMEM;
@@ -2466,7 +2466,7 @@ init_ccw_bk(struct net_device *dev)
2466 2466
2467#ifdef DEBUGMSG 2467#ifdef DEBUGMSG
2468 printk(KERN_INFO "%s:%s End build claw write free chain \n", 2468 printk(KERN_INFO "%s:%s End build claw write free chain \n",
2469 dev->name,__FUNCTION__); 2469 dev->name,__func__);
2470 p_buf=privptr->p_write_free_chain; 2470 p_buf=privptr->p_write_free_chain;
2471 while (p_buf!=NULL) { 2471 while (p_buf!=NULL) {
2472 dumpit((char *)p_buf, sizeof(struct ccwbk)); 2472 dumpit((char *)p_buf, sizeof(struct ccwbk));
@@ -2485,7 +2485,7 @@ init_ccw_bk(struct net_device *dev)
2485 printk(KERN_INFO "%s: %s() " 2485 printk(KERN_INFO "%s: %s() "
2486 "__get_free_pages for read buf failed : " 2486 "__get_free_pages for read buf failed : "
2487 "get is for %d pages\n", 2487 "get is for %d pages\n",
2488 dev->name,__FUNCTION__,claw_read_pages ); 2488 dev->name,__func__,claw_read_pages );
2489 free_pages((unsigned long)privptr->p_buff_ccw, 2489 free_pages((unsigned long)privptr->p_buff_ccw,
2490 (int)pages_to_order_of_mag( 2490 (int)pages_to_order_of_mag(
2491 privptr->p_buff_ccw_num)); 2491 privptr->p_buff_ccw_num));
@@ -2497,7 +2497,7 @@ init_ccw_bk(struct net_device *dev)
2497 privptr->p_buff_write=NULL; 2497 privptr->p_buff_write=NULL;
2498#ifdef FUNCTRACE 2498#ifdef FUNCTRACE
2499 printk(KERN_INFO "%s: %s() > exit on line %d, rc =" 2499 printk(KERN_INFO "%s: %s() > exit on line %d, rc ="
2500 " ENOMEM\n",dev->name,__FUNCTION__,__LINE__); 2500 " ENOMEM\n",dev->name,__func__,__LINE__);
2501#endif 2501#endif
2502 return -ENOMEM; 2502 return -ENOMEM;
2503 } 2503 }
@@ -2509,7 +2509,7 @@ init_ccw_bk(struct net_device *dev)
2509 */ 2509 */
2510#ifdef DEBUGMSG 2510#ifdef DEBUGMSG
2511 printk(KERN_INFO "%s: %s() Begin build claw read free chain \n", 2511 printk(KERN_INFO "%s: %s() Begin build claw read free chain \n",
2512 dev->name,__FUNCTION__); 2512 dev->name,__func__);
2513#endif 2513#endif
2514 p_buff=privptr->p_buff_read; 2514 p_buff=privptr->p_buff_read;
2515 for (i=0 ; i< privptr->p_env->read_buffers ; i++) { 2515 for (i=0 ; i< privptr->p_env->read_buffers ; i++) {
@@ -2590,7 +2590,7 @@ init_ccw_bk(struct net_device *dev)
2590 2590
2591#ifdef DEBUGMSG 2591#ifdef DEBUGMSG
2592 printk(KERN_INFO "%s: %s() Begin build claw read free chain \n", 2592 printk(KERN_INFO "%s: %s() Begin build claw read free chain \n",
2593 dev->name,__FUNCTION__); 2593 dev->name,__func__);
2594#endif 2594#endif
2595 for (i=0 ; i< privptr->p_env->read_buffers ; i++) { 2595 for (i=0 ; i< privptr->p_env->read_buffers ; i++) {
2596 p_buff = (void *)__get_free_pages(__GFP_DMA, 2596 p_buff = (void *)__get_free_pages(__GFP_DMA,
@@ -2598,7 +2598,7 @@ init_ccw_bk(struct net_device *dev)
2598 if (p_buff==NULL) { 2598 if (p_buff==NULL) {
2599 printk(KERN_INFO "%s: %s() __get_free_pages for read " 2599 printk(KERN_INFO "%s: %s() __get_free_pages for read "
2600 "buf failed : get is for %d pages\n", 2600 "buf failed : get is for %d pages\n",
2601 dev->name,__FUNCTION__, 2601 dev->name,__func__,
2602 privptr->p_buff_pages_perread ); 2602 privptr->p_buff_pages_perread );
2603 free_pages((unsigned long)privptr->p_buff_ccw, 2603 free_pages((unsigned long)privptr->p_buff_ccw,
2604 (int)pages_to_order_of_mag(privptr->p_buff_ccw_num)); 2604 (int)pages_to_order_of_mag(privptr->p_buff_ccw_num));
@@ -2622,7 +2622,7 @@ init_ccw_bk(struct net_device *dev)
2622 privptr->p_buff_write=NULL; 2622 privptr->p_buff_write=NULL;
2623#ifdef FUNCTRACE 2623#ifdef FUNCTRACE
2624 printk(KERN_INFO "%s: %s() exit on line %d, rc = ENOMEM\n", 2624 printk(KERN_INFO "%s: %s() exit on line %d, rc = ENOMEM\n",
2625 dev->name,__FUNCTION__, 2625 dev->name,__func__,
2626 __LINE__); 2626 __LINE__);
2627#endif 2627#endif
2628 return -ENOMEM; 2628 return -ENOMEM;
@@ -2695,7 +2695,7 @@ init_ccw_bk(struct net_device *dev)
2695 } /* pBuffread = NULL */ 2695 } /* pBuffread = NULL */
2696#ifdef DEBUGMSG 2696#ifdef DEBUGMSG
2697 printk(KERN_INFO "%s: %s() > End build claw read free chain \n", 2697 printk(KERN_INFO "%s: %s() > End build claw read free chain \n",
2698 dev->name,__FUNCTION__); 2698 dev->name,__func__);
2699 p_buf=p_first_CCWB; 2699 p_buf=p_first_CCWB;
2700 while (p_buf!=NULL) { 2700 while (p_buf!=NULL) {
2701 dumpit((char *)p_buf, sizeof(struct ccwbk)); 2701 dumpit((char *)p_buf, sizeof(struct ccwbk));
@@ -2707,7 +2707,7 @@ init_ccw_bk(struct net_device *dev)
2707 privptr->buffs_alloc = 1; 2707 privptr->buffs_alloc = 1;
2708#ifdef FUNCTRACE 2708#ifdef FUNCTRACE
2709 printk(KERN_INFO "%s: %s() exit on line %d\n", 2709 printk(KERN_INFO "%s: %s() exit on line %d\n",
2710 dev->name,__FUNCTION__,__LINE__); 2710 dev->name,__func__,__LINE__);
2711#endif 2711#endif
2712 return 0; 2712 return 0;
2713} /* end of init_ccw_bk */ 2713} /* end of init_ccw_bk */
@@ -2723,11 +2723,11 @@ probe_error( struct ccwgroup_device *cgdev)
2723{ 2723{
2724 struct claw_privbk *privptr; 2724 struct claw_privbk *privptr;
2725#ifdef FUNCTRACE 2725#ifdef FUNCTRACE
2726 printk(KERN_INFO "%s enter \n",__FUNCTION__); 2726 printk(KERN_INFO "%s enter \n",__func__);
2727#endif 2727#endif
2728 CLAW_DBF_TEXT(4,trace,"proberr"); 2728 CLAW_DBF_TEXT(4,trace,"proberr");
2729#ifdef DEBUGMSG 2729#ifdef DEBUGMSG
2730 printk(KERN_INFO "%s variable cgdev =\n",__FUNCTION__); 2730 printk(KERN_INFO "%s variable cgdev =\n",__func__);
2731 dumpit((char *) cgdev, sizeof(struct ccwgroup_device)); 2731 dumpit((char *) cgdev, sizeof(struct ccwgroup_device));
2732#endif 2732#endif
2733 privptr=(struct claw_privbk *)cgdev->dev.driver_data; 2733 privptr=(struct claw_privbk *)cgdev->dev.driver_data;
@@ -2741,7 +2741,7 @@ probe_error( struct ccwgroup_device *cgdev)
2741 } 2741 }
2742#ifdef FUNCTRACE 2742#ifdef FUNCTRACE
2743 printk(KERN_INFO "%s > exit on line %d\n", 2743 printk(KERN_INFO "%s > exit on line %d\n",
2744 __FUNCTION__,__LINE__); 2744 __func__,__LINE__);
2745#endif 2745#endif
2746 2746
2747 return; 2747 return;
@@ -2772,7 +2772,7 @@ claw_process_control( struct net_device *dev, struct ccwbk * p_ccw)
2772 struct chbk *p_ch = NULL; 2772 struct chbk *p_ch = NULL;
2773#ifdef FUNCTRACE 2773#ifdef FUNCTRACE
2774 printk(KERN_INFO "%s: %s() > enter \n", 2774 printk(KERN_INFO "%s: %s() > enter \n",
2775 dev->name,__FUNCTION__); 2775 dev->name,__func__);
2776#endif 2776#endif
2777 CLAW_DBF_TEXT(2,setup,"clw_cntl"); 2777 CLAW_DBF_TEXT(2,setup,"clw_cntl");
2778#ifdef DEBUGMSG 2778#ifdef DEBUGMSG
@@ -2794,7 +2794,7 @@ claw_process_control( struct net_device *dev, struct ccwbk * p_ccw)
2794#ifdef FUNCTRACE 2794#ifdef FUNCTRACE
2795 printk(KERN_INFO "%s: %s() > " 2795 printk(KERN_INFO "%s: %s() > "
2796 "exit on line %d, rc=0\n", 2796 "exit on line %d, rc=0\n",
2797 dev->name,__FUNCTION__,__LINE__); 2797 dev->name,__func__,__LINE__);
2798#endif 2798#endif
2799 return 0; 2799 return 0;
2800 } 2800 }
@@ -3057,7 +3057,7 @@ claw_process_control( struct net_device *dev, struct ccwbk * p_ccw)
3057 3057
3058#ifdef FUNCTRACE 3058#ifdef FUNCTRACE
3059 printk(KERN_INFO "%s: %s() exit on line %d, rc = 0\n", 3059 printk(KERN_INFO "%s: %s() exit on line %d, rc = 0\n",
3060 dev->name,__FUNCTION__,__LINE__); 3060 dev->name,__func__,__LINE__);
3061#endif 3061#endif
3062 3062
3063 return 0; 3063 return 0;
@@ -3080,7 +3080,7 @@ claw_send_control(struct net_device *dev, __u8 type, __u8 link,
3080 struct sk_buff *skb; 3080 struct sk_buff *skb;
3081 3081
3082#ifdef FUNCTRACE 3082#ifdef FUNCTRACE
3083 printk(KERN_INFO "%s:%s > enter \n",dev->name,__FUNCTION__); 3083 printk(KERN_INFO "%s:%s > enter \n",dev->name,__func__);
3084#endif 3084#endif
3085 CLAW_DBF_TEXT(2,setup,"sndcntl"); 3085 CLAW_DBF_TEXT(2,setup,"sndcntl");
3086#ifdef DEBUGMSG 3086#ifdef DEBUGMSG
@@ -3143,10 +3143,10 @@ claw_send_control(struct net_device *dev, __u8 type, __u8 link,
3143 skb = dev_alloc_skb(sizeof(struct clawctl)); 3143 skb = dev_alloc_skb(sizeof(struct clawctl));
3144 if (!skb) { 3144 if (!skb) {
3145 printk( "%s:%s low on mem, returning...\n", 3145 printk( "%s:%s low on mem, returning...\n",
3146 dev->name,__FUNCTION__); 3146 dev->name,__func__);
3147#ifdef DEBUG 3147#ifdef DEBUG
3148 printk(KERN_INFO "%s:%s Exit, rc = ENOMEM\n", 3148 printk(KERN_INFO "%s:%s Exit, rc = ENOMEM\n",
3149 dev->name,__FUNCTION__); 3149 dev->name,__func__);
3150#endif 3150#endif
3151 return -ENOMEM; 3151 return -ENOMEM;
3152 } 3152 }
@@ -3162,7 +3162,7 @@ claw_send_control(struct net_device *dev, __u8 type, __u8 link,
3162 claw_hw_tx(skb, dev, 0); 3162 claw_hw_tx(skb, dev, 0);
3163#ifdef FUNCTRACE 3163#ifdef FUNCTRACE
3164 printk(KERN_INFO "%s:%s Exit on line %d\n", 3164 printk(KERN_INFO "%s:%s Exit on line %d\n",
3165 dev->name,__FUNCTION__,__LINE__); 3165 dev->name,__func__,__LINE__);
3166#endif 3166#endif
3167 3167
3168 return 0; 3168 return 0;
@@ -3180,7 +3180,7 @@ claw_snd_conn_req(struct net_device *dev, __u8 link)
3180 struct clawctl *p_ctl; 3180 struct clawctl *p_ctl;
3181 3181
3182#ifdef FUNCTRACE 3182#ifdef FUNCTRACE
3183 printk(KERN_INFO "%s:%s Enter \n",dev->name,__FUNCTION__); 3183 printk(KERN_INFO "%s:%s Enter \n",dev->name,__func__);
3184#endif 3184#endif
3185 CLAW_DBF_TEXT(2,setup,"snd_conn"); 3185 CLAW_DBF_TEXT(2,setup,"snd_conn");
3186#ifdef DEBUGMSG 3186#ifdef DEBUGMSG
@@ -3193,7 +3193,7 @@ claw_snd_conn_req(struct net_device *dev, __u8 link)
3193 if ( privptr->system_validate_comp==0x00 ) { 3193 if ( privptr->system_validate_comp==0x00 ) {
3194#ifdef FUNCTRACE 3194#ifdef FUNCTRACE
3195 printk(KERN_INFO "%s:%s Exit on line %d, rc = 1\n", 3195 printk(KERN_INFO "%s:%s Exit on line %d, rc = 1\n",
3196 dev->name,__FUNCTION__,__LINE__); 3196 dev->name,__func__,__LINE__);
3197#endif 3197#endif
3198 return rc; 3198 return rc;
3199 } 3199 }
@@ -3209,7 +3209,7 @@ claw_snd_conn_req(struct net_device *dev, __u8 link)
3209 HOST_APPL_NAME, privptr->p_env->api_type); 3209 HOST_APPL_NAME, privptr->p_env->api_type);
3210#ifdef FUNCTRACE 3210#ifdef FUNCTRACE
3211 printk(KERN_INFO "%s:%s Exit on line %d, rc = %d\n", 3211 printk(KERN_INFO "%s:%s Exit on line %d, rc = %d\n",
3212 dev->name,__FUNCTION__,__LINE__, rc); 3212 dev->name,__func__,__LINE__, rc);
3213#endif 3213#endif
3214 return rc; 3214 return rc;
3215 3215
@@ -3228,7 +3228,7 @@ claw_snd_disc(struct net_device *dev, struct clawctl * p_ctl)
3228 struct conncmd * p_connect; 3228 struct conncmd * p_connect;
3229 3229
3230#ifdef FUNCTRACE 3230#ifdef FUNCTRACE
3231 printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__); 3231 printk(KERN_INFO "%s:%s Enter\n",dev->name,__func__);
3232#endif 3232#endif
3233 CLAW_DBF_TEXT(2,setup,"snd_dsc"); 3233 CLAW_DBF_TEXT(2,setup,"snd_dsc");
3234#ifdef DEBUGMSG 3234#ifdef DEBUGMSG
@@ -3244,7 +3244,7 @@ claw_snd_disc(struct net_device *dev, struct clawctl * p_ctl)
3244 p_connect->host_name, p_connect->WS_name); 3244 p_connect->host_name, p_connect->WS_name);
3245#ifdef FUNCTRACE 3245#ifdef FUNCTRACE
3246 printk(KERN_INFO "%s:%s Exit on line %d, rc = %d\n", 3246 printk(KERN_INFO "%s:%s Exit on line %d, rc = %d\n",
3247 dev->name,__FUNCTION__, __LINE__, rc); 3247 dev->name,__func__, __LINE__, rc);
3248#endif 3248#endif
3249 return rc; 3249 return rc;
3250} /* end of claw_snd_disc */ 3250} /* end of claw_snd_disc */
@@ -3265,7 +3265,7 @@ claw_snd_sys_validate_rsp(struct net_device *dev,
3265 3265
3266#ifdef FUNCTRACE 3266#ifdef FUNCTRACE
3267 printk(KERN_INFO "%s:%s Enter\n", 3267 printk(KERN_INFO "%s:%s Enter\n",
3268 dev->name,__FUNCTION__); 3268 dev->name,__func__);
3269#endif 3269#endif
3270 CLAW_DBF_TEXT(2,setup,"chkresp"); 3270 CLAW_DBF_TEXT(2,setup,"chkresp");
3271#ifdef DEBUGMSG 3271#ifdef DEBUGMSG
@@ -3285,7 +3285,7 @@ claw_snd_sys_validate_rsp(struct net_device *dev,
3285 p_env->adapter_name ); 3285 p_env->adapter_name );
3286#ifdef FUNCTRACE 3286#ifdef FUNCTRACE
3287 printk(KERN_INFO "%s:%s Exit on line %d, rc = %d\n", 3287 printk(KERN_INFO "%s:%s Exit on line %d, rc = %d\n",
3288 dev->name,__FUNCTION__,__LINE__, rc); 3288 dev->name,__func__,__LINE__, rc);
3289#endif 3289#endif
3290 return rc; 3290 return rc;
3291} /* end of claw_snd_sys_validate_rsp */ 3291} /* end of claw_snd_sys_validate_rsp */
@@ -3301,7 +3301,7 @@ claw_strt_conn_req(struct net_device *dev )
3301 int rc; 3301 int rc;
3302 3302
3303#ifdef FUNCTRACE 3303#ifdef FUNCTRACE
3304 printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__); 3304 printk(KERN_INFO "%s:%s Enter\n",dev->name,__func__);
3305#endif 3305#endif
3306 CLAW_DBF_TEXT(2,setup,"conn_req"); 3306 CLAW_DBF_TEXT(2,setup,"conn_req");
3307#ifdef DEBUGMSG 3307#ifdef DEBUGMSG
@@ -3311,7 +3311,7 @@ claw_strt_conn_req(struct net_device *dev )
3311 rc=claw_snd_conn_req(dev, 1); 3311 rc=claw_snd_conn_req(dev, 1);
3312#ifdef FUNCTRACE 3312#ifdef FUNCTRACE
3313 printk(KERN_INFO "%s:%s Exit on line %d, rc = %d\n", 3313 printk(KERN_INFO "%s:%s Exit on line %d, rc = %d\n",
3314 dev->name,__FUNCTION__,__LINE__, rc); 3314 dev->name,__func__,__LINE__, rc);
3315#endif 3315#endif
3316 return rc; 3316 return rc;
3317} /* end of claw_strt_conn_req */ 3317} /* end of claw_strt_conn_req */
@@ -3327,13 +3327,13 @@ net_device_stats *claw_stats(struct net_device *dev)
3327{ 3327{
3328 struct claw_privbk *privptr; 3328 struct claw_privbk *privptr;
3329#ifdef FUNCTRACE 3329#ifdef FUNCTRACE
3330 printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__); 3330 printk(KERN_INFO "%s:%s Enter\n",dev->name,__func__);
3331#endif 3331#endif
3332 CLAW_DBF_TEXT(4,trace,"stats"); 3332 CLAW_DBF_TEXT(4,trace,"stats");
3333 privptr = dev->priv; 3333 privptr = dev->priv;
3334#ifdef FUNCTRACE 3334#ifdef FUNCTRACE
3335 printk(KERN_INFO "%s:%s Exit on line %d\n", 3335 printk(KERN_INFO "%s:%s Exit on line %d\n",
3336 dev->name,__FUNCTION__,__LINE__); 3336 dev->name,__func__,__LINE__);
3337#endif 3337#endif
3338 return &privptr->stats; 3338 return &privptr->stats;
3339} /* end of claw_stats */ 3339} /* end of claw_stats */
@@ -3366,7 +3366,7 @@ unpack_read(struct net_device *dev )
3366 int p=0; 3366 int p=0;
3367 3367
3368#ifdef FUNCTRACE 3368#ifdef FUNCTRACE
3369 printk(KERN_INFO "%s:%s enter \n",dev->name,__FUNCTION__); 3369 printk(KERN_INFO "%s:%s enter \n",dev->name,__func__);
3370#endif 3370#endif
3371 CLAW_DBF_TEXT(4,trace,"unpkread"); 3371 CLAW_DBF_TEXT(4,trace,"unpkread");
3372 p_first_ccw=NULL; 3372 p_first_ccw=NULL;
@@ -3408,7 +3408,7 @@ unpack_read(struct net_device *dev )
3408 if ((p_this_ccw->header.opcode & MORE_to_COME_FLAG)!=0) { 3408 if ((p_this_ccw->header.opcode & MORE_to_COME_FLAG)!=0) {
3409#ifdef DEBUGMSG 3409#ifdef DEBUGMSG
3410 printk(KERN_INFO "%s: %s > More_to_come is ON\n", 3410 printk(KERN_INFO "%s: %s > More_to_come is ON\n",
3411 dev->name,__FUNCTION__); 3411 dev->name,__func__);
3412#endif 3412#endif
3413 mtc_this_frm=1; 3413 mtc_this_frm=1;
3414 if (p_this_ccw->header.length!= 3414 if (p_this_ccw->header.length!=
@@ -3435,7 +3435,7 @@ unpack_read(struct net_device *dev )
3435#ifdef DEBUGMSG 3435#ifdef DEBUGMSG
3436 printk(KERN_INFO "%s:%s goto next " 3436 printk(KERN_INFO "%s:%s goto next "
3437 "frame from MoretoComeSkip \n", 3437 "frame from MoretoComeSkip \n",
3438 dev->name,__FUNCTION__); 3438 dev->name,__func__);
3439#endif 3439#endif
3440 goto NextFrame; 3440 goto NextFrame;
3441 } 3441 }
@@ -3445,7 +3445,7 @@ unpack_read(struct net_device *dev )
3445#ifdef DEBUGMSG 3445#ifdef DEBUGMSG
3446 printk(KERN_INFO "%s:%s goto next " 3446 printk(KERN_INFO "%s:%s goto next "
3447 "frame from claw_process_control \n", 3447 "frame from claw_process_control \n",
3448 dev->name,__FUNCTION__); 3448 dev->name,__func__);
3449#endif 3449#endif
3450 CLAW_DBF_TEXT(4,trace,"UnpkCntl"); 3450 CLAW_DBF_TEXT(4,trace,"UnpkCntl");
3451 goto NextFrame; 3451 goto NextFrame;
@@ -3468,7 +3468,7 @@ unpack_next:
3468 if (privptr->mtc_logical_link<0) { 3468 if (privptr->mtc_logical_link<0) {
3469#ifdef DEBUGMSG 3469#ifdef DEBUGMSG
3470 printk(KERN_INFO "%s: %s mtc_logical_link < 0 \n", 3470 printk(KERN_INFO "%s: %s mtc_logical_link < 0 \n",
3471 dev->name,__FUNCTION__); 3471 dev->name,__func__);
3472#endif 3472#endif
3473 3473
3474 /* 3474 /*
@@ -3487,7 +3487,7 @@ unpack_next:
3487 printk(KERN_INFO "%s: %s > goto next " 3487 printk(KERN_INFO "%s: %s > goto next "
3488 "frame from MoretoComeSkip \n", 3488 "frame from MoretoComeSkip \n",
3489 dev->name, 3489 dev->name,
3490 __FUNCTION__); 3490 __func__);
3491 printk(KERN_INFO " bytes_to_mov %d > (MAX_ENVELOPE_" 3491 printk(KERN_INFO " bytes_to_mov %d > (MAX_ENVELOPE_"
3492 "SIZE-privptr->mtc_offset %d)\n", 3492 "SIZE-privptr->mtc_offset %d)\n",
3493 bytes_to_mov,(MAX_ENVELOPE_SIZE- privptr->mtc_offset)); 3493 bytes_to_mov,(MAX_ENVELOPE_SIZE- privptr->mtc_offset));
@@ -3505,13 +3505,13 @@ unpack_next:
3505 } 3505 }
3506#ifdef DEBUGMSG 3506#ifdef DEBUGMSG
3507 printk(KERN_INFO "%s: %s() received data \n", 3507 printk(KERN_INFO "%s: %s() received data \n",
3508 dev->name,__FUNCTION__); 3508 dev->name,__func__);
3509 if (p_env->packing == DO_PACKED) 3509 if (p_env->packing == DO_PACKED)
3510 dumpit((char *)p_packd+sizeof(struct clawph),32); 3510 dumpit((char *)p_packd+sizeof(struct clawph),32);
3511 else 3511 else
3512 dumpit((char *)p_this_ccw->p_buffer, 32); 3512 dumpit((char *)p_this_ccw->p_buffer, 32);
3513 printk(KERN_INFO "%s: %s() bytelength %d \n", 3513 printk(KERN_INFO "%s: %s() bytelength %d \n",
3514 dev->name,__FUNCTION__,bytes_to_mov); 3514 dev->name,__func__,bytes_to_mov);
3515#endif 3515#endif
3516 if (mtc_this_frm==0) { 3516 if (mtc_this_frm==0) {
3517 len_of_data=privptr->mtc_offset+bytes_to_mov; 3517 len_of_data=privptr->mtc_offset+bytes_to_mov;
@@ -3530,13 +3530,13 @@ unpack_next:
3530#ifdef DEBUGMSG 3530#ifdef DEBUGMSG
3531 printk(KERN_INFO "%s: %s() netif_" 3531 printk(KERN_INFO "%s: %s() netif_"
3532 "rx(skb) completed \n", 3532 "rx(skb) completed \n",
3533 dev->name,__FUNCTION__); 3533 dev->name,__func__);
3534#endif 3534#endif
3535 } 3535 }
3536 else { 3536 else {
3537 privptr->stats.rx_dropped++; 3537 privptr->stats.rx_dropped++;
3538 printk(KERN_WARNING "%s: %s() low on memory\n", 3538 printk(KERN_WARNING "%s: %s() low on memory\n",
3539 dev->name,__FUNCTION__); 3539 dev->name,__func__);
3540 } 3540 }
3541 privptr->mtc_offset=0; 3541 privptr->mtc_offset=0;
3542 privptr->mtc_logical_link=-1; 3542 privptr->mtc_logical_link=-1;
@@ -3575,10 +3575,10 @@ NextFrame:
3575 3575
3576#ifdef IOTRACE 3576#ifdef IOTRACE
3577 printk(KERN_INFO "%s:%s processed frame is %d \n", 3577 printk(KERN_INFO "%s:%s processed frame is %d \n",
3578 dev->name,__FUNCTION__,i); 3578 dev->name,__func__,i);
3579 printk(KERN_INFO "%s:%s F:%lx L:%lx\n", 3579 printk(KERN_INFO "%s:%s F:%lx L:%lx\n",
3580 dev->name, 3580 dev->name,
3581 __FUNCTION__, 3581 __func__,
3582 (unsigned long)p_first_ccw, 3582 (unsigned long)p_first_ccw,
3583 (unsigned long)p_last_ccw); 3583 (unsigned long)p_last_ccw);
3584#endif 3584#endif
@@ -3588,7 +3588,7 @@ NextFrame:
3588 claw_strt_read(dev, LOCK_YES); 3588 claw_strt_read(dev, LOCK_YES);
3589#ifdef FUNCTRACE 3589#ifdef FUNCTRACE
3590 printk(KERN_INFO "%s: %s exit on line %d\n", 3590 printk(KERN_INFO "%s: %s exit on line %d\n",
3591 dev->name, __FUNCTION__, __LINE__); 3591 dev->name, __func__, __LINE__);
3592#endif 3592#endif
3593 return; 3593 return;
3594} /* end of unpack_read */ 3594} /* end of unpack_read */
@@ -3610,7 +3610,7 @@ claw_strt_read (struct net_device *dev, int lock )
3610 p_ch=&privptr->channel[READ]; 3610 p_ch=&privptr->channel[READ];
3611 3611
3612#ifdef FUNCTRACE 3612#ifdef FUNCTRACE
3613 printk(KERN_INFO "%s:%s Enter \n",dev->name,__FUNCTION__); 3613 printk(KERN_INFO "%s:%s Enter \n",dev->name,__func__);
3614 printk(KERN_INFO "%s: variable lock = %d, dev =\n",dev->name, lock); 3614 printk(KERN_INFO "%s: variable lock = %d, dev =\n",dev->name, lock);
3615 dumpit((char *) dev, sizeof(struct net_device)); 3615 dumpit((char *) dev, sizeof(struct net_device));
3616#endif 3616#endif
@@ -3626,7 +3626,7 @@ claw_strt_read (struct net_device *dev, int lock )
3626 } 3626 }
3627#ifdef DEBUGMSG 3627#ifdef DEBUGMSG
3628 printk(KERN_INFO "%s:%s state-%02x\n" , 3628 printk(KERN_INFO "%s:%s state-%02x\n" ,
3629 dev->name,__FUNCTION__, p_ch->claw_state); 3629 dev->name,__func__, p_ch->claw_state);
3630#endif 3630#endif
3631 if (lock==LOCK_YES) { 3631 if (lock==LOCK_YES) {
3632 spin_lock_irqsave(get_ccwdev_lock(p_ch->cdev), saveflags); 3632 spin_lock_irqsave(get_ccwdev_lock(p_ch->cdev), saveflags);
@@ -3634,7 +3634,7 @@ claw_strt_read (struct net_device *dev, int lock )
3634 if (test_and_set_bit(0, (void *)&p_ch->IO_active) == 0) { 3634 if (test_and_set_bit(0, (void *)&p_ch->IO_active) == 0) {
3635#ifdef DEBUGMSG 3635#ifdef DEBUGMSG
3636 printk(KERN_INFO "%s: HOT READ started in %s\n" , 3636 printk(KERN_INFO "%s: HOT READ started in %s\n" ,
3637 dev->name,__FUNCTION__); 3637 dev->name,__func__);
3638 p_clawh=(struct clawh *)privptr->p_claw_signal_blk; 3638 p_clawh=(struct clawh *)privptr->p_claw_signal_blk;
3639 dumpit((char *)&p_clawh->flag , 1); 3639 dumpit((char *)&p_clawh->flag , 1);
3640#endif 3640#endif
@@ -3650,7 +3650,7 @@ claw_strt_read (struct net_device *dev, int lock )
3650 else { 3650 else {
3651#ifdef DEBUGMSG 3651#ifdef DEBUGMSG
3652 printk(KERN_INFO "%s: No READ started by %s() In progress\n" , 3652 printk(KERN_INFO "%s: No READ started by %s() In progress\n" ,
3653 dev->name,__FUNCTION__); 3653 dev->name,__func__);
3654#endif 3654#endif
3655 CLAW_DBF_TEXT(2,trace,"ReadAct"); 3655 CLAW_DBF_TEXT(2,trace,"ReadAct");
3656 } 3656 }
@@ -3660,7 +3660,7 @@ claw_strt_read (struct net_device *dev, int lock )
3660 } 3660 }
3661#ifdef FUNCTRACE 3661#ifdef FUNCTRACE
3662 printk(KERN_INFO "%s:%s Exit on line %d\n", 3662 printk(KERN_INFO "%s:%s Exit on line %d\n",
3663 dev->name,__FUNCTION__,__LINE__); 3663 dev->name,__func__,__LINE__);
3664#endif 3664#endif
3665 CLAW_DBF_TEXT(4,trace,"StRdExit"); 3665 CLAW_DBF_TEXT(4,trace,"StRdExit");
3666 return; 3666 return;
@@ -3681,7 +3681,7 @@ claw_strt_out_IO( struct net_device *dev )
3681 struct ccwbk *p_first_ccw; 3681 struct ccwbk *p_first_ccw;
3682 3682
3683#ifdef FUNCTRACE 3683#ifdef FUNCTRACE
3684 printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__); 3684 printk(KERN_INFO "%s:%s Enter\n",dev->name,__func__);
3685#endif 3685#endif
3686 if (!dev) { 3686 if (!dev) {
3687 return; 3687 return;
@@ -3691,7 +3691,7 @@ claw_strt_out_IO( struct net_device *dev )
3691 3691
3692#ifdef DEBUGMSG 3692#ifdef DEBUGMSG
3693 printk(KERN_INFO "%s:%s state-%02x\n" , 3693 printk(KERN_INFO "%s:%s state-%02x\n" ,
3694 dev->name,__FUNCTION__,p_ch->claw_state); 3694 dev->name,__func__,p_ch->claw_state);
3695#endif 3695#endif
3696 CLAW_DBF_TEXT(4,trace,"strt_io"); 3696 CLAW_DBF_TEXT(4,trace,"strt_io");
3697 p_first_ccw=privptr->p_write_active_first; 3697 p_first_ccw=privptr->p_write_active_first;
@@ -3701,14 +3701,14 @@ claw_strt_out_IO( struct net_device *dev )
3701 if (p_first_ccw == NULL) { 3701 if (p_first_ccw == NULL) {
3702#ifdef FUNCTRACE 3702#ifdef FUNCTRACE
3703 printk(KERN_INFO "%s:%s Exit on line %d\n", 3703 printk(KERN_INFO "%s:%s Exit on line %d\n",
3704 dev->name,__FUNCTION__,__LINE__); 3704 dev->name,__func__,__LINE__);
3705#endif 3705#endif
3706 return; 3706 return;
3707 } 3707 }
3708 if (test_and_set_bit(0, (void *)&p_ch->IO_active) == 0) { 3708 if (test_and_set_bit(0, (void *)&p_ch->IO_active) == 0) {
3709 parm = (unsigned long) p_ch; 3709 parm = (unsigned long) p_ch;
3710#ifdef DEBUGMSG 3710#ifdef DEBUGMSG
3711 printk(KERN_INFO "%s:%s do_io \n" ,dev->name,__FUNCTION__); 3711 printk(KERN_INFO "%s:%s do_io \n" ,dev->name,__func__);
3712 dumpit((char *)p_first_ccw, sizeof(struct ccwbk)); 3712 dumpit((char *)p_first_ccw, sizeof(struct ccwbk));
3713#endif 3713#endif
3714 CLAW_DBF_TEXT(2,trace,"StWrtIO"); 3714 CLAW_DBF_TEXT(2,trace,"StWrtIO");
@@ -3721,7 +3721,7 @@ claw_strt_out_IO( struct net_device *dev )
3721 dev->trans_start = jiffies; 3721 dev->trans_start = jiffies;
3722#ifdef FUNCTRACE 3722#ifdef FUNCTRACE
3723 printk(KERN_INFO "%s:%s Exit on line %d\n", 3723 printk(KERN_INFO "%s:%s Exit on line %d\n",
3724 dev->name,__FUNCTION__,__LINE__); 3724 dev->name,__func__,__LINE__);
3725#endif 3725#endif
3726 3726
3727 return; 3727 return;
@@ -3745,7 +3745,7 @@ claw_free_wrt_buf( struct net_device *dev )
3745 struct ccwbk*p_buf; 3745 struct ccwbk*p_buf;
3746#endif 3746#endif
3747#ifdef FUNCTRACE 3747#ifdef FUNCTRACE
3748 printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__); 3748 printk(KERN_INFO "%s:%s Enter\n",dev->name,__func__);
3749 printk(KERN_INFO "%s: free count = %d variable dev =\n", 3749 printk(KERN_INFO "%s: free count = %d variable dev =\n",
3750 dev->name,privptr->write_free_count); 3750 dev->name,privptr->write_free_count);
3751#endif 3751#endif
@@ -3798,7 +3798,7 @@ claw_free_wrt_buf( struct net_device *dev )
3798 privptr->p_write_active_last=NULL; 3798 privptr->p_write_active_last=NULL;
3799#ifdef DEBUGMSG 3799#ifdef DEBUGMSG
3800 printk(KERN_INFO "%s:%s p_write_" 3800 printk(KERN_INFO "%s:%s p_write_"
3801 "active_first==NULL\n",dev->name,__FUNCTION__); 3801 "active_first==NULL\n",dev->name,__func__);
3802#endif 3802#endif
3803 } 3803 }
3804#ifdef IOTRACE 3804#ifdef IOTRACE
@@ -3819,7 +3819,7 @@ claw_free_wrt_buf( struct net_device *dev )
3819 CLAW_DBF_TEXT_(4,trace,"FWC=%d",privptr->write_free_count); 3819 CLAW_DBF_TEXT_(4,trace,"FWC=%d",privptr->write_free_count);
3820#ifdef FUNCTRACE 3820#ifdef FUNCTRACE
3821 printk(KERN_INFO "%s:%s Exit on line %d free_count =%d\n", 3821 printk(KERN_INFO "%s:%s Exit on line %d free_count =%d\n",
3822 dev->name,__FUNCTION__, __LINE__,privptr->write_free_count); 3822 dev->name,__func__, __LINE__,privptr->write_free_count);
3823#endif 3823#endif
3824 return; 3824 return;
3825} 3825}
@@ -3833,7 +3833,7 @@ claw_free_netdevice(struct net_device * dev, int free_dev)
3833{ 3833{
3834 struct claw_privbk *privptr; 3834 struct claw_privbk *privptr;
3835#ifdef FUNCTRACE 3835#ifdef FUNCTRACE
3836 printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__); 3836 printk(KERN_INFO "%s:%s Enter\n",dev->name,__func__);
3837#endif 3837#endif
3838 CLAW_DBF_TEXT(2,setup,"free_dev"); 3838 CLAW_DBF_TEXT(2,setup,"free_dev");
3839 3839
@@ -3854,7 +3854,7 @@ claw_free_netdevice(struct net_device * dev, int free_dev)
3854#endif 3854#endif
3855 CLAW_DBF_TEXT(2,setup,"feee_ok"); 3855 CLAW_DBF_TEXT(2,setup,"feee_ok");
3856#ifdef FUNCTRACE 3856#ifdef FUNCTRACE
3857 printk(KERN_INFO "%s:%s Exit\n",dev->name,__FUNCTION__); 3857 printk(KERN_INFO "%s:%s Exit\n",dev->name,__func__);
3858#endif 3858#endif
3859} 3859}
3860 3860
@@ -3867,13 +3867,13 @@ static void
3867claw_init_netdevice(struct net_device * dev) 3867claw_init_netdevice(struct net_device * dev)
3868{ 3868{
3869#ifdef FUNCTRACE 3869#ifdef FUNCTRACE
3870 printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__); 3870 printk(KERN_INFO "%s:%s Enter\n",dev->name,__func__);
3871#endif 3871#endif
3872 CLAW_DBF_TEXT(2,setup,"init_dev"); 3872 CLAW_DBF_TEXT(2,setup,"init_dev");
3873 CLAW_DBF_TEXT_(2,setup,"%s",dev->name); 3873 CLAW_DBF_TEXT_(2,setup,"%s",dev->name);
3874 if (!dev) { 3874 if (!dev) {
3875 printk(KERN_WARNING "claw:%s BAD Device exit line %d\n", 3875 printk(KERN_WARNING "claw:%s BAD Device exit line %d\n",
3876 __FUNCTION__,__LINE__); 3876 __func__,__LINE__);
3877 CLAW_DBF_TEXT(2,setup,"baddev"); 3877 CLAW_DBF_TEXT(2,setup,"baddev");
3878 return; 3878 return;
3879 } 3879 }
@@ -3889,7 +3889,7 @@ claw_init_netdevice(struct net_device * dev)
3889 dev->tx_queue_len = 1300; 3889 dev->tx_queue_len = 1300;
3890 dev->flags = IFF_POINTOPOINT | IFF_NOARP; 3890 dev->flags = IFF_POINTOPOINT | IFF_NOARP;
3891#ifdef FUNCTRACE 3891#ifdef FUNCTRACE
3892 printk(KERN_INFO "%s:%s Exit\n",dev->name,__FUNCTION__); 3892 printk(KERN_INFO "%s:%s Exit\n",dev->name,__func__);
3893#endif 3893#endif
3894 CLAW_DBF_TEXT(2,setup,"initok"); 3894 CLAW_DBF_TEXT(2,setup,"initok");
3895 return; 3895 return;
@@ -3909,7 +3909,7 @@ add_channel(struct ccw_device *cdev,int i,struct claw_privbk *privptr)
3909 struct ccw_dev_id dev_id; 3909 struct ccw_dev_id dev_id;
3910 3910
3911#ifdef FUNCTRACE 3911#ifdef FUNCTRACE
3912 printk(KERN_INFO "%s:%s Enter\n",cdev->dev.bus_id,__FUNCTION__); 3912 printk(KERN_INFO "%s:%s Enter\n",cdev->dev.bus_id,__func__);
3913#endif 3913#endif
3914 CLAW_DBF_TEXT_(2,setup,"%s",cdev->dev.bus_id); 3914 CLAW_DBF_TEXT_(2,setup,"%s",cdev->dev.bus_id);
3915 privptr->channel[i].flag = i+1; /* Read is 1 Write is 2 */ 3915 privptr->channel[i].flag = i+1; /* Read is 1 Write is 2 */
@@ -3920,16 +3920,16 @@ add_channel(struct ccw_device *cdev,int i,struct claw_privbk *privptr)
3920 p_ch->devno = dev_id.devno; 3920 p_ch->devno = dev_id.devno;
3921 if ((p_ch->irb = kzalloc(sizeof (struct irb),GFP_KERNEL)) == NULL) { 3921 if ((p_ch->irb = kzalloc(sizeof (struct irb),GFP_KERNEL)) == NULL) {
3922 printk(KERN_WARNING "%s Out of memory in %s for irb\n", 3922 printk(KERN_WARNING "%s Out of memory in %s for irb\n",
3923 p_ch->id,__FUNCTION__); 3923 p_ch->id,__func__);
3924#ifdef FUNCTRACE 3924#ifdef FUNCTRACE
3925 printk(KERN_INFO "%s:%s Exit on line %d\n", 3925 printk(KERN_INFO "%s:%s Exit on line %d\n",
3926 p_ch->id,__FUNCTION__,__LINE__); 3926 p_ch->id,__func__,__LINE__);
3927#endif 3927#endif
3928 return -ENOMEM; 3928 return -ENOMEM;
3929 } 3929 }
3930#ifdef FUNCTRACE 3930#ifdef FUNCTRACE
3931 printk(KERN_INFO "%s:%s Exit on line %d\n", 3931 printk(KERN_INFO "%s:%s Exit on line %d\n",
3932 cdev->dev.bus_id,__FUNCTION__,__LINE__); 3932 cdev->dev.bus_id,__func__,__LINE__);
3933#endif 3933#endif
3934 return 0; 3934 return 0;
3935} 3935}
@@ -3952,7 +3952,7 @@ claw_new_device(struct ccwgroup_device *cgdev)
3952 int ret; 3952 int ret;
3953 struct ccw_dev_id dev_id; 3953 struct ccw_dev_id dev_id;
3954 3954
3955 pr_debug("%s() called\n", __FUNCTION__); 3955 pr_debug("%s() called\n", __func__);
3956 printk(KERN_INFO "claw: add for %s\n",cgdev->cdev[READ]->dev.bus_id); 3956 printk(KERN_INFO "claw: add for %s\n",cgdev->cdev[READ]->dev.bus_id);
3957 CLAW_DBF_TEXT(2,setup,"new_dev"); 3957 CLAW_DBF_TEXT(2,setup,"new_dev");
3958 privptr = cgdev->dev.driver_data; 3958 privptr = cgdev->dev.driver_data;
@@ -3990,7 +3990,7 @@ claw_new_device(struct ccwgroup_device *cgdev)
3990 } 3990 }
3991 dev = alloc_netdev(0,"claw%d",claw_init_netdevice); 3991 dev = alloc_netdev(0,"claw%d",claw_init_netdevice);
3992 if (!dev) { 3992 if (!dev) {
3993 printk(KERN_WARNING "%s:alloc_netdev failed\n",__FUNCTION__); 3993 printk(KERN_WARNING "%s:alloc_netdev failed\n",__func__);
3994 goto out; 3994 goto out;
3995 } 3995 }
3996 dev->priv = privptr; 3996 dev->priv = privptr;
@@ -4065,7 +4065,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev)
4065 struct net_device *ndev; 4065 struct net_device *ndev;
4066 int ret; 4066 int ret;
4067 4067
4068 pr_debug("%s() called\n", __FUNCTION__); 4068 pr_debug("%s() called\n", __func__);
4069 CLAW_DBF_TEXT_(2,setup,"%s",cgdev->dev.bus_id); 4069 CLAW_DBF_TEXT_(2,setup,"%s",cgdev->dev.bus_id);
4070 priv = cgdev->dev.driver_data; 4070 priv = cgdev->dev.driver_data;
4071 if (!priv) 4071 if (!priv)
@@ -4095,15 +4095,15 @@ claw_remove_device(struct ccwgroup_device *cgdev)
4095{ 4095{
4096 struct claw_privbk *priv; 4096 struct claw_privbk *priv;
4097 4097
4098 pr_debug("%s() called\n", __FUNCTION__); 4098 pr_debug("%s() called\n", __func__);
4099 CLAW_DBF_TEXT_(2,setup,"%s",cgdev->dev.bus_id); 4099 CLAW_DBF_TEXT_(2,setup,"%s",cgdev->dev.bus_id);
4100 priv = cgdev->dev.driver_data; 4100 priv = cgdev->dev.driver_data;
4101 if (!priv) { 4101 if (!priv) {
4102 printk(KERN_WARNING "claw: %s() no Priv exiting\n",__FUNCTION__); 4102 printk(KERN_WARNING "claw: %s() no Priv exiting\n",__func__);
4103 return; 4103 return;
4104 } 4104 }
4105 printk(KERN_INFO "claw: %s() called %s will be removed.\n", 4105 printk(KERN_INFO "claw: %s() called %s will be removed.\n",
4106 __FUNCTION__,cgdev->cdev[0]->dev.bus_id); 4106 __func__,cgdev->cdev[0]->dev.bus_id);
4107 if (cgdev->state == CCWGROUP_ONLINE) 4107 if (cgdev->state == CCWGROUP_ONLINE)
4108 claw_shutdown_device(cgdev); 4108 claw_shutdown_device(cgdev);
4109 claw_remove_files(&cgdev->dev); 4109 claw_remove_files(&cgdev->dev);
@@ -4346,7 +4346,7 @@ static struct attribute_group claw_attr_group = {
4346static int 4346static int
4347claw_add_files(struct device *dev) 4347claw_add_files(struct device *dev)
4348{ 4348{
4349 pr_debug("%s() called\n", __FUNCTION__); 4349 pr_debug("%s() called\n", __func__);
4350 CLAW_DBF_TEXT(2,setup,"add_file"); 4350 CLAW_DBF_TEXT(2,setup,"add_file");
4351 return sysfs_create_group(&dev->kobj, &claw_attr_group); 4351 return sysfs_create_group(&dev->kobj, &claw_attr_group);
4352} 4352}
@@ -4354,7 +4354,7 @@ claw_add_files(struct device *dev)
4354static void 4354static void
4355claw_remove_files(struct device *dev) 4355claw_remove_files(struct device *dev)
4356{ 4356{
4357 pr_debug("%s() called\n", __FUNCTION__); 4357 pr_debug("%s() called\n", __func__);
4358 CLAW_DBF_TEXT(2,setup,"rem_file"); 4358 CLAW_DBF_TEXT(2,setup,"rem_file");
4359 sysfs_remove_group(&dev->kobj, &claw_attr_group); 4359 sysfs_remove_group(&dev->kobj, &claw_attr_group);
4360} 4360}
@@ -4385,12 +4385,12 @@ claw_init(void)
4385 printk(KERN_INFO "claw: starting driver\n"); 4385 printk(KERN_INFO "claw: starting driver\n");
4386 4386
4387#ifdef FUNCTRACE 4387#ifdef FUNCTRACE
4388 printk(KERN_INFO "claw: %s() enter \n",__FUNCTION__); 4388 printk(KERN_INFO "claw: %s() enter \n",__func__);
4389#endif 4389#endif
4390 ret = claw_register_debug_facility(); 4390 ret = claw_register_debug_facility();
4391 if (ret) { 4391 if (ret) {
4392 printk(KERN_WARNING "claw: %s() debug_register failed %d\n", 4392 printk(KERN_WARNING "claw: %s() debug_register failed %d\n",
4393 __FUNCTION__,ret); 4393 __func__,ret);
4394 return ret; 4394 return ret;
4395 } 4395 }
4396 CLAW_DBF_TEXT(2,setup,"init_mod"); 4396 CLAW_DBF_TEXT(2,setup,"init_mod");
@@ -4398,10 +4398,10 @@ claw_init(void)
4398 if (ret) { 4398 if (ret) {
4399 claw_unregister_debug_facility(); 4399 claw_unregister_debug_facility();
4400 printk(KERN_WARNING "claw; %s() cu3088 register failed %d\n", 4400 printk(KERN_WARNING "claw; %s() cu3088 register failed %d\n",
4401 __FUNCTION__,ret); 4401 __func__,ret);
4402 } 4402 }
4403#ifdef FUNCTRACE 4403#ifdef FUNCTRACE
4404 printk(KERN_INFO "claw: %s() exit \n",__FUNCTION__); 4404 printk(KERN_INFO "claw: %s() exit \n",__func__);
4405#endif 4405#endif
4406 return ret; 4406 return ret;
4407} 4407}
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 874a19994489..8f876f6ab367 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -670,7 +670,7 @@ static void conn_action_rx(fsm_instance *fi, int event, void *arg)
670 struct netiucv_priv *privptr = netdev_priv(conn->netdev); 670 struct netiucv_priv *privptr = netdev_priv(conn->netdev);
671 int rc; 671 int rc;
672 672
673 IUCV_DBF_TEXT(trace, 4, __FUNCTION__); 673 IUCV_DBF_TEXT(trace, 4, __func__);
674 674
675 if (!conn->netdev) { 675 if (!conn->netdev) {
676 iucv_message_reject(conn->path, msg); 676 iucv_message_reject(conn->path, msg);
@@ -718,7 +718,7 @@ static void conn_action_txdone(fsm_instance *fi, int event, void *arg)
718 struct ll_header header; 718 struct ll_header header;
719 int rc; 719 int rc;
720 720
721 IUCV_DBF_TEXT(trace, 4, __FUNCTION__); 721 IUCV_DBF_TEXT(trace, 4, __func__);
722 722
723 if (conn && conn->netdev) 723 if (conn && conn->netdev)
724 privptr = netdev_priv(conn->netdev); 724 privptr = netdev_priv(conn->netdev);
@@ -799,7 +799,7 @@ static void conn_action_connaccept(fsm_instance *fi, int event, void *arg)
799 struct netiucv_priv *privptr = netdev_priv(netdev); 799 struct netiucv_priv *privptr = netdev_priv(netdev);
800 int rc; 800 int rc;
801 801
802 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 802 IUCV_DBF_TEXT(trace, 3, __func__);
803 803
804 conn->path = path; 804 conn->path = path;
805 path->msglim = NETIUCV_QUEUELEN_DEFAULT; 805 path->msglim = NETIUCV_QUEUELEN_DEFAULT;
@@ -821,7 +821,7 @@ static void conn_action_connreject(fsm_instance *fi, int event, void *arg)
821 struct iucv_event *ev = arg; 821 struct iucv_event *ev = arg;
822 struct iucv_path *path = ev->data; 822 struct iucv_path *path = ev->data;
823 823
824 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 824 IUCV_DBF_TEXT(trace, 3, __func__);
825 iucv_path_sever(path, NULL); 825 iucv_path_sever(path, NULL);
826} 826}
827 827
@@ -831,7 +831,7 @@ static void conn_action_connack(fsm_instance *fi, int event, void *arg)
831 struct net_device *netdev = conn->netdev; 831 struct net_device *netdev = conn->netdev;
832 struct netiucv_priv *privptr = netdev_priv(netdev); 832 struct netiucv_priv *privptr = netdev_priv(netdev);
833 833
834 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 834 IUCV_DBF_TEXT(trace, 3, __func__);
835 fsm_deltimer(&conn->timer); 835 fsm_deltimer(&conn->timer);
836 fsm_newstate(fi, CONN_STATE_IDLE); 836 fsm_newstate(fi, CONN_STATE_IDLE);
837 netdev->tx_queue_len = conn->path->msglim; 837 netdev->tx_queue_len = conn->path->msglim;
@@ -842,7 +842,7 @@ static void conn_action_conntimsev(fsm_instance *fi, int event, void *arg)
842{ 842{
843 struct iucv_connection *conn = arg; 843 struct iucv_connection *conn = arg;
844 844
845 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 845 IUCV_DBF_TEXT(trace, 3, __func__);
846 fsm_deltimer(&conn->timer); 846 fsm_deltimer(&conn->timer);
847 iucv_path_sever(conn->path, NULL); 847 iucv_path_sever(conn->path, NULL);
848 fsm_newstate(fi, CONN_STATE_STARTWAIT); 848 fsm_newstate(fi, CONN_STATE_STARTWAIT);
@@ -854,7 +854,7 @@ static void conn_action_connsever(fsm_instance *fi, int event, void *arg)
854 struct net_device *netdev = conn->netdev; 854 struct net_device *netdev = conn->netdev;
855 struct netiucv_priv *privptr = netdev_priv(netdev); 855 struct netiucv_priv *privptr = netdev_priv(netdev);
856 856
857 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 857 IUCV_DBF_TEXT(trace, 3, __func__);
858 858
859 fsm_deltimer(&conn->timer); 859 fsm_deltimer(&conn->timer);
860 iucv_path_sever(conn->path, NULL); 860 iucv_path_sever(conn->path, NULL);
@@ -870,7 +870,7 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)
870 struct iucv_connection *conn = arg; 870 struct iucv_connection *conn = arg;
871 int rc; 871 int rc;
872 872
873 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 873 IUCV_DBF_TEXT(trace, 3, __func__);
874 874
875 fsm_newstate(fi, CONN_STATE_STARTWAIT); 875 fsm_newstate(fi, CONN_STATE_STARTWAIT);
876 PRINT_DEBUG("%s('%s'): connecting ...\n", 876 PRINT_DEBUG("%s('%s'): connecting ...\n",
@@ -948,7 +948,7 @@ static void conn_action_stop(fsm_instance *fi, int event, void *arg)
948 struct net_device *netdev = conn->netdev; 948 struct net_device *netdev = conn->netdev;
949 struct netiucv_priv *privptr = netdev_priv(netdev); 949 struct netiucv_priv *privptr = netdev_priv(netdev);
950 950
951 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 951 IUCV_DBF_TEXT(trace, 3, __func__);
952 952
953 fsm_deltimer(&conn->timer); 953 fsm_deltimer(&conn->timer);
954 fsm_newstate(fi, CONN_STATE_STOPPED); 954 fsm_newstate(fi, CONN_STATE_STOPPED);
@@ -1024,7 +1024,7 @@ static void dev_action_start(fsm_instance *fi, int event, void *arg)
1024 struct net_device *dev = arg; 1024 struct net_device *dev = arg;
1025 struct netiucv_priv *privptr = netdev_priv(dev); 1025 struct netiucv_priv *privptr = netdev_priv(dev);
1026 1026
1027 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1027 IUCV_DBF_TEXT(trace, 3, __func__);
1028 1028
1029 fsm_newstate(fi, DEV_STATE_STARTWAIT); 1029 fsm_newstate(fi, DEV_STATE_STARTWAIT);
1030 fsm_event(privptr->conn->fsm, CONN_EVENT_START, privptr->conn); 1030 fsm_event(privptr->conn->fsm, CONN_EVENT_START, privptr->conn);
@@ -1044,7 +1044,7 @@ dev_action_stop(fsm_instance *fi, int event, void *arg)
1044 struct netiucv_priv *privptr = netdev_priv(dev); 1044 struct netiucv_priv *privptr = netdev_priv(dev);
1045 struct iucv_event ev; 1045 struct iucv_event ev;
1046 1046
1047 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1047 IUCV_DBF_TEXT(trace, 3, __func__);
1048 1048
1049 ev.conn = privptr->conn; 1049 ev.conn = privptr->conn;
1050 1050
@@ -1066,7 +1066,7 @@ dev_action_connup(fsm_instance *fi, int event, void *arg)
1066 struct net_device *dev = arg; 1066 struct net_device *dev = arg;
1067 struct netiucv_priv *privptr = netdev_priv(dev); 1067 struct netiucv_priv *privptr = netdev_priv(dev);
1068 1068
1069 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1069 IUCV_DBF_TEXT(trace, 3, __func__);
1070 1070
1071 switch (fsm_getstate(fi)) { 1071 switch (fsm_getstate(fi)) {
1072 case DEV_STATE_STARTWAIT: 1072 case DEV_STATE_STARTWAIT:
@@ -1097,7 +1097,7 @@ dev_action_connup(fsm_instance *fi, int event, void *arg)
1097static void 1097static void
1098dev_action_conndown(fsm_instance *fi, int event, void *arg) 1098dev_action_conndown(fsm_instance *fi, int event, void *arg)
1099{ 1099{
1100 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1100 IUCV_DBF_TEXT(trace, 3, __func__);
1101 1101
1102 switch (fsm_getstate(fi)) { 1102 switch (fsm_getstate(fi)) {
1103 case DEV_STATE_RUNNING: 1103 case DEV_STATE_RUNNING:
@@ -1288,7 +1288,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
1288 struct netiucv_priv *privptr = netdev_priv(dev); 1288 struct netiucv_priv *privptr = netdev_priv(dev);
1289 int rc; 1289 int rc;
1290 1290
1291 IUCV_DBF_TEXT(trace, 4, __FUNCTION__); 1291 IUCV_DBF_TEXT(trace, 4, __func__);
1292 /** 1292 /**
1293 * Some sanity checks ... 1293 * Some sanity checks ...
1294 */ 1294 */
@@ -1344,7 +1344,7 @@ static struct net_device_stats *netiucv_stats (struct net_device * dev)
1344{ 1344{
1345 struct netiucv_priv *priv = netdev_priv(dev); 1345 struct netiucv_priv *priv = netdev_priv(dev);
1346 1346
1347 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1347 IUCV_DBF_TEXT(trace, 5, __func__);
1348 return &priv->stats; 1348 return &priv->stats;
1349} 1349}
1350 1350
@@ -1360,7 +1360,7 @@ static struct net_device_stats *netiucv_stats (struct net_device * dev)
1360 */ 1360 */
1361static int netiucv_change_mtu(struct net_device * dev, int new_mtu) 1361static int netiucv_change_mtu(struct net_device * dev, int new_mtu)
1362{ 1362{
1363 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1363 IUCV_DBF_TEXT(trace, 3, __func__);
1364 if (new_mtu < 576 || new_mtu > NETIUCV_MTU_MAX) { 1364 if (new_mtu < 576 || new_mtu > NETIUCV_MTU_MAX) {
1365 IUCV_DBF_TEXT(setup, 2, "given MTU out of valid range\n"); 1365 IUCV_DBF_TEXT(setup, 2, "given MTU out of valid range\n");
1366 return -EINVAL; 1366 return -EINVAL;
@@ -1378,7 +1378,7 @@ static ssize_t user_show(struct device *dev, struct device_attribute *attr,
1378{ 1378{
1379 struct netiucv_priv *priv = dev->driver_data; 1379 struct netiucv_priv *priv = dev->driver_data;
1380 1380
1381 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1381 IUCV_DBF_TEXT(trace, 5, __func__);
1382 return sprintf(buf, "%s\n", netiucv_printname(priv->conn->userid)); 1382 return sprintf(buf, "%s\n", netiucv_printname(priv->conn->userid));
1383} 1383}
1384 1384
@@ -1393,7 +1393,7 @@ static ssize_t user_write(struct device *dev, struct device_attribute *attr,
1393 int i; 1393 int i;
1394 struct iucv_connection *cp; 1394 struct iucv_connection *cp;
1395 1395
1396 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1396 IUCV_DBF_TEXT(trace, 3, __func__);
1397 if (count > 9) { 1397 if (count > 9) {
1398 PRINT_WARN("netiucv: username too long (%d)!\n", (int) count); 1398 PRINT_WARN("netiucv: username too long (%d)!\n", (int) count);
1399 IUCV_DBF_TEXT_(setup, 2, 1399 IUCV_DBF_TEXT_(setup, 2,
@@ -1449,7 +1449,7 @@ static ssize_t buffer_show (struct device *dev, struct device_attribute *attr,
1449 char *buf) 1449 char *buf)
1450{ struct netiucv_priv *priv = dev->driver_data; 1450{ struct netiucv_priv *priv = dev->driver_data;
1451 1451
1452 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1452 IUCV_DBF_TEXT(trace, 5, __func__);
1453 return sprintf(buf, "%d\n", priv->conn->max_buffsize); 1453 return sprintf(buf, "%d\n", priv->conn->max_buffsize);
1454} 1454}
1455 1455
@@ -1461,7 +1461,7 @@ static ssize_t buffer_write (struct device *dev, struct device_attribute *attr,
1461 char *e; 1461 char *e;
1462 int bs1; 1462 int bs1;
1463 1463
1464 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1464 IUCV_DBF_TEXT(trace, 3, __func__);
1465 if (count >= 39) 1465 if (count >= 39)
1466 return -EINVAL; 1466 return -EINVAL;
1467 1467
@@ -1513,7 +1513,7 @@ static ssize_t dev_fsm_show (struct device *dev, struct device_attribute *attr,
1513{ 1513{
1514 struct netiucv_priv *priv = dev->driver_data; 1514 struct netiucv_priv *priv = dev->driver_data;
1515 1515
1516 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1516 IUCV_DBF_TEXT(trace, 5, __func__);
1517 return sprintf(buf, "%s\n", fsm_getstate_str(priv->fsm)); 1517 return sprintf(buf, "%s\n", fsm_getstate_str(priv->fsm));
1518} 1518}
1519 1519
@@ -1524,7 +1524,7 @@ static ssize_t conn_fsm_show (struct device *dev,
1524{ 1524{
1525 struct netiucv_priv *priv = dev->driver_data; 1525 struct netiucv_priv *priv = dev->driver_data;
1526 1526
1527 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1527 IUCV_DBF_TEXT(trace, 5, __func__);
1528 return sprintf(buf, "%s\n", fsm_getstate_str(priv->conn->fsm)); 1528 return sprintf(buf, "%s\n", fsm_getstate_str(priv->conn->fsm));
1529} 1529}
1530 1530
@@ -1535,7 +1535,7 @@ static ssize_t maxmulti_show (struct device *dev,
1535{ 1535{
1536 struct netiucv_priv *priv = dev->driver_data; 1536 struct netiucv_priv *priv = dev->driver_data;
1537 1537
1538 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1538 IUCV_DBF_TEXT(trace, 5, __func__);
1539 return sprintf(buf, "%ld\n", priv->conn->prof.maxmulti); 1539 return sprintf(buf, "%ld\n", priv->conn->prof.maxmulti);
1540} 1540}
1541 1541
@@ -1545,7 +1545,7 @@ static ssize_t maxmulti_write (struct device *dev,
1545{ 1545{
1546 struct netiucv_priv *priv = dev->driver_data; 1546 struct netiucv_priv *priv = dev->driver_data;
1547 1547
1548 IUCV_DBF_TEXT(trace, 4, __FUNCTION__); 1548 IUCV_DBF_TEXT(trace, 4, __func__);
1549 priv->conn->prof.maxmulti = 0; 1549 priv->conn->prof.maxmulti = 0;
1550 return count; 1550 return count;
1551} 1551}
@@ -1557,7 +1557,7 @@ static ssize_t maxcq_show (struct device *dev, struct device_attribute *attr,
1557{ 1557{
1558 struct netiucv_priv *priv = dev->driver_data; 1558 struct netiucv_priv *priv = dev->driver_data;
1559 1559
1560 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1560 IUCV_DBF_TEXT(trace, 5, __func__);
1561 return sprintf(buf, "%ld\n", priv->conn->prof.maxcqueue); 1561 return sprintf(buf, "%ld\n", priv->conn->prof.maxcqueue);
1562} 1562}
1563 1563
@@ -1566,7 +1566,7 @@ static ssize_t maxcq_write (struct device *dev, struct device_attribute *attr,
1566{ 1566{
1567 struct netiucv_priv *priv = dev->driver_data; 1567 struct netiucv_priv *priv = dev->driver_data;
1568 1568
1569 IUCV_DBF_TEXT(trace, 4, __FUNCTION__); 1569 IUCV_DBF_TEXT(trace, 4, __func__);
1570 priv->conn->prof.maxcqueue = 0; 1570 priv->conn->prof.maxcqueue = 0;
1571 return count; 1571 return count;
1572} 1572}
@@ -1578,7 +1578,7 @@ static ssize_t sdoio_show (struct device *dev, struct device_attribute *attr,
1578{ 1578{
1579 struct netiucv_priv *priv = dev->driver_data; 1579 struct netiucv_priv *priv = dev->driver_data;
1580 1580
1581 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1581 IUCV_DBF_TEXT(trace, 5, __func__);
1582 return sprintf(buf, "%ld\n", priv->conn->prof.doios_single); 1582 return sprintf(buf, "%ld\n", priv->conn->prof.doios_single);
1583} 1583}
1584 1584
@@ -1587,7 +1587,7 @@ static ssize_t sdoio_write (struct device *dev, struct device_attribute *attr,
1587{ 1587{
1588 struct netiucv_priv *priv = dev->driver_data; 1588 struct netiucv_priv *priv = dev->driver_data;
1589 1589
1590 IUCV_DBF_TEXT(trace, 4, __FUNCTION__); 1590 IUCV_DBF_TEXT(trace, 4, __func__);
1591 priv->conn->prof.doios_single = 0; 1591 priv->conn->prof.doios_single = 0;
1592 return count; 1592 return count;
1593} 1593}
@@ -1599,7 +1599,7 @@ static ssize_t mdoio_show (struct device *dev, struct device_attribute *attr,
1599{ 1599{
1600 struct netiucv_priv *priv = dev->driver_data; 1600 struct netiucv_priv *priv = dev->driver_data;
1601 1601
1602 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1602 IUCV_DBF_TEXT(trace, 5, __func__);
1603 return sprintf(buf, "%ld\n", priv->conn->prof.doios_multi); 1603 return sprintf(buf, "%ld\n", priv->conn->prof.doios_multi);
1604} 1604}
1605 1605
@@ -1608,7 +1608,7 @@ static ssize_t mdoio_write (struct device *dev, struct device_attribute *attr,
1608{ 1608{
1609 struct netiucv_priv *priv = dev->driver_data; 1609 struct netiucv_priv *priv = dev->driver_data;
1610 1610
1611 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1611 IUCV_DBF_TEXT(trace, 5, __func__);
1612 priv->conn->prof.doios_multi = 0; 1612 priv->conn->prof.doios_multi = 0;
1613 return count; 1613 return count;
1614} 1614}
@@ -1620,7 +1620,7 @@ static ssize_t txlen_show (struct device *dev, struct device_attribute *attr,
1620{ 1620{
1621 struct netiucv_priv *priv = dev->driver_data; 1621 struct netiucv_priv *priv = dev->driver_data;
1622 1622
1623 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1623 IUCV_DBF_TEXT(trace, 5, __func__);
1624 return sprintf(buf, "%ld\n", priv->conn->prof.txlen); 1624 return sprintf(buf, "%ld\n", priv->conn->prof.txlen);
1625} 1625}
1626 1626
@@ -1629,7 +1629,7 @@ static ssize_t txlen_write (struct device *dev, struct device_attribute *attr,
1629{ 1629{
1630 struct netiucv_priv *priv = dev->driver_data; 1630 struct netiucv_priv *priv = dev->driver_data;
1631 1631
1632 IUCV_DBF_TEXT(trace, 4, __FUNCTION__); 1632 IUCV_DBF_TEXT(trace, 4, __func__);
1633 priv->conn->prof.txlen = 0; 1633 priv->conn->prof.txlen = 0;
1634 return count; 1634 return count;
1635} 1635}
@@ -1641,7 +1641,7 @@ static ssize_t txtime_show (struct device *dev, struct device_attribute *attr,
1641{ 1641{
1642 struct netiucv_priv *priv = dev->driver_data; 1642 struct netiucv_priv *priv = dev->driver_data;
1643 1643
1644 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1644 IUCV_DBF_TEXT(trace, 5, __func__);
1645 return sprintf(buf, "%ld\n", priv->conn->prof.tx_time); 1645 return sprintf(buf, "%ld\n", priv->conn->prof.tx_time);
1646} 1646}
1647 1647
@@ -1650,7 +1650,7 @@ static ssize_t txtime_write (struct device *dev, struct device_attribute *attr,
1650{ 1650{
1651 struct netiucv_priv *priv = dev->driver_data; 1651 struct netiucv_priv *priv = dev->driver_data;
1652 1652
1653 IUCV_DBF_TEXT(trace, 4, __FUNCTION__); 1653 IUCV_DBF_TEXT(trace, 4, __func__);
1654 priv->conn->prof.tx_time = 0; 1654 priv->conn->prof.tx_time = 0;
1655 return count; 1655 return count;
1656} 1656}
@@ -1662,7 +1662,7 @@ static ssize_t txpend_show (struct device *dev, struct device_attribute *attr,
1662{ 1662{
1663 struct netiucv_priv *priv = dev->driver_data; 1663 struct netiucv_priv *priv = dev->driver_data;
1664 1664
1665 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1665 IUCV_DBF_TEXT(trace, 5, __func__);
1666 return sprintf(buf, "%ld\n", priv->conn->prof.tx_pending); 1666 return sprintf(buf, "%ld\n", priv->conn->prof.tx_pending);
1667} 1667}
1668 1668
@@ -1671,7 +1671,7 @@ static ssize_t txpend_write (struct device *dev, struct device_attribute *attr,
1671{ 1671{
1672 struct netiucv_priv *priv = dev->driver_data; 1672 struct netiucv_priv *priv = dev->driver_data;
1673 1673
1674 IUCV_DBF_TEXT(trace, 4, __FUNCTION__); 1674 IUCV_DBF_TEXT(trace, 4, __func__);
1675 priv->conn->prof.tx_pending = 0; 1675 priv->conn->prof.tx_pending = 0;
1676 return count; 1676 return count;
1677} 1677}
@@ -1683,7 +1683,7 @@ static ssize_t txmpnd_show (struct device *dev, struct device_attribute *attr,
1683{ 1683{
1684 struct netiucv_priv *priv = dev->driver_data; 1684 struct netiucv_priv *priv = dev->driver_data;
1685 1685
1686 IUCV_DBF_TEXT(trace, 5, __FUNCTION__); 1686 IUCV_DBF_TEXT(trace, 5, __func__);
1687 return sprintf(buf, "%ld\n", priv->conn->prof.tx_max_pending); 1687 return sprintf(buf, "%ld\n", priv->conn->prof.tx_max_pending);
1688} 1688}
1689 1689
@@ -1692,7 +1692,7 @@ static ssize_t txmpnd_write (struct device *dev, struct device_attribute *attr,
1692{ 1692{
1693 struct netiucv_priv *priv = dev->driver_data; 1693 struct netiucv_priv *priv = dev->driver_data;
1694 1694
1695 IUCV_DBF_TEXT(trace, 4, __FUNCTION__); 1695 IUCV_DBF_TEXT(trace, 4, __func__);
1696 priv->conn->prof.tx_max_pending = 0; 1696 priv->conn->prof.tx_max_pending = 0;
1697 return count; 1697 return count;
1698} 1698}
@@ -1732,7 +1732,7 @@ static int netiucv_add_files(struct device *dev)
1732{ 1732{
1733 int ret; 1733 int ret;
1734 1734
1735 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1735 IUCV_DBF_TEXT(trace, 3, __func__);
1736 ret = sysfs_create_group(&dev->kobj, &netiucv_attr_group); 1736 ret = sysfs_create_group(&dev->kobj, &netiucv_attr_group);
1737 if (ret) 1737 if (ret)
1738 return ret; 1738 return ret;
@@ -1744,7 +1744,7 @@ static int netiucv_add_files(struct device *dev)
1744 1744
1745static void netiucv_remove_files(struct device *dev) 1745static void netiucv_remove_files(struct device *dev)
1746{ 1746{
1747 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1747 IUCV_DBF_TEXT(trace, 3, __func__);
1748 sysfs_remove_group(&dev->kobj, &netiucv_stat_attr_group); 1748 sysfs_remove_group(&dev->kobj, &netiucv_stat_attr_group);
1749 sysfs_remove_group(&dev->kobj, &netiucv_attr_group); 1749 sysfs_remove_group(&dev->kobj, &netiucv_attr_group);
1750} 1750}
@@ -1756,7 +1756,7 @@ static int netiucv_register_device(struct net_device *ndev)
1756 int ret; 1756 int ret;
1757 1757
1758 1758
1759 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1759 IUCV_DBF_TEXT(trace, 3, __func__);
1760 1760
1761 if (dev) { 1761 if (dev) {
1762 snprintf(dev->bus_id, BUS_ID_SIZE, "net%s", ndev->name); 1762 snprintf(dev->bus_id, BUS_ID_SIZE, "net%s", ndev->name);
@@ -1792,7 +1792,7 @@ out_unreg:
1792 1792
1793static void netiucv_unregister_device(struct device *dev) 1793static void netiucv_unregister_device(struct device *dev)
1794{ 1794{
1795 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1795 IUCV_DBF_TEXT(trace, 3, __func__);
1796 netiucv_remove_files(dev); 1796 netiucv_remove_files(dev);
1797 device_unregister(dev); 1797 device_unregister(dev);
1798} 1798}
@@ -1857,7 +1857,7 @@ out:
1857 */ 1857 */
1858static void netiucv_remove_connection(struct iucv_connection *conn) 1858static void netiucv_remove_connection(struct iucv_connection *conn)
1859{ 1859{
1860 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1860 IUCV_DBF_TEXT(trace, 3, __func__);
1861 write_lock_bh(&iucv_connection_rwlock); 1861 write_lock_bh(&iucv_connection_rwlock);
1862 list_del_init(&conn->list); 1862 list_del_init(&conn->list);
1863 write_unlock_bh(&iucv_connection_rwlock); 1863 write_unlock_bh(&iucv_connection_rwlock);
@@ -1881,7 +1881,7 @@ static void netiucv_free_netdevice(struct net_device *dev)
1881{ 1881{
1882 struct netiucv_priv *privptr = netdev_priv(dev); 1882 struct netiucv_priv *privptr = netdev_priv(dev);
1883 1883
1884 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1884 IUCV_DBF_TEXT(trace, 3, __func__);
1885 1885
1886 if (!dev) 1886 if (!dev)
1887 return; 1887 return;
@@ -1963,7 +1963,7 @@ static ssize_t conn_write(struct device_driver *drv,
1963 struct netiucv_priv *priv; 1963 struct netiucv_priv *priv;
1964 struct iucv_connection *cp; 1964 struct iucv_connection *cp;
1965 1965
1966 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 1966 IUCV_DBF_TEXT(trace, 3, __func__);
1967 if (count>9) { 1967 if (count>9) {
1968 PRINT_WARN("netiucv: username too long (%d)!\n", (int)count); 1968 PRINT_WARN("netiucv: username too long (%d)!\n", (int)count);
1969 IUCV_DBF_TEXT(setup, 2, "conn_write: too long\n"); 1969 IUCV_DBF_TEXT(setup, 2, "conn_write: too long\n");
@@ -2048,7 +2048,7 @@ static ssize_t remove_write (struct device_driver *drv,
2048 const char *p; 2048 const char *p;
2049 int i; 2049 int i;
2050 2050
2051 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 2051 IUCV_DBF_TEXT(trace, 3, __func__);
2052 2052
2053 if (count >= IFNAMSIZ) 2053 if (count >= IFNAMSIZ)
2054 count = IFNAMSIZ - 1;; 2054 count = IFNAMSIZ - 1;;
@@ -2116,7 +2116,7 @@ static void __exit netiucv_exit(void)
2116 struct netiucv_priv *priv; 2116 struct netiucv_priv *priv;
2117 struct device *dev; 2117 struct device *dev;
2118 2118
2119 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 2119 IUCV_DBF_TEXT(trace, 3, __func__);
2120 while (!list_empty(&iucv_connection_list)) { 2120 while (!list_empty(&iucv_connection_list)) {
2121 cp = list_entry(iucv_connection_list.next, 2121 cp = list_entry(iucv_connection_list.next,
2122 struct iucv_connection, list); 2122 struct iucv_connection, list);
@@ -2146,8 +2146,7 @@ static int __init netiucv_init(void)
2146 rc = iucv_register(&netiucv_handler, 1); 2146 rc = iucv_register(&netiucv_handler, 1);
2147 if (rc) 2147 if (rc)
2148 goto out_dbf; 2148 goto out_dbf;
2149 IUCV_DBF_TEXT(trace, 3, __FUNCTION__); 2149 IUCV_DBF_TEXT(trace, 3, __func__);
2150 netiucv_driver.groups = netiucv_drv_attr_groups;
2151 rc = driver_register(&netiucv_driver); 2150 rc = driver_register(&netiucv_driver);
2152 if (rc) { 2151 if (rc) {
2153 PRINT_ERR("NETIUCV: failed to register driver.\n"); 2152 PRINT_ERR("NETIUCV: failed to register driver.\n");
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index 644a06eba828..4d4b54277c43 100644
--- a/drivers/s390/s390mach.c
+++ b/drivers/s390/s390mach.c
@@ -59,15 +59,15 @@ repeat:
59 59
60 printk(KERN_WARNING"%s: Code does not support more " 60 printk(KERN_WARNING"%s: Code does not support more "
61 "than two chained crws; please report to " 61 "than two chained crws; please report to "
62 "linux390@de.ibm.com!\n", __FUNCTION__); 62 "linux390@de.ibm.com!\n", __func__);
63 ccode = stcrw(&tmp_crw); 63 ccode = stcrw(&tmp_crw);
64 printk(KERN_WARNING"%s: crw reports slct=%d, oflw=%d, " 64 printk(KERN_WARNING"%s: crw reports slct=%d, oflw=%d, "
65 "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n", 65 "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n",
66 __FUNCTION__, tmp_crw.slct, tmp_crw.oflw, 66 __func__, tmp_crw.slct, tmp_crw.oflw,
67 tmp_crw.chn, tmp_crw.rsc, tmp_crw.anc, 67 tmp_crw.chn, tmp_crw.rsc, tmp_crw.anc,
68 tmp_crw.erc, tmp_crw.rsid); 68 tmp_crw.erc, tmp_crw.rsid);
69 printk(KERN_WARNING"%s: This was crw number %x in the " 69 printk(KERN_WARNING"%s: This was crw number %x in the "
70 "chain\n", __FUNCTION__, chain); 70 "chain\n", __func__, chain);
71 if (ccode != 0) 71 if (ccode != 0)
72 break; 72 break;
73 chain = tmp_crw.chn ? chain + 1 : 0; 73 chain = tmp_crw.chn ? chain + 1 : 0;
@@ -83,7 +83,7 @@ repeat:
83 crw[chain].rsid); 83 crw[chain].rsid);
84 /* Check for overflows. */ 84 /* Check for overflows. */
85 if (crw[chain].oflw) { 85 if (crw[chain].oflw) {
86 pr_debug("%s: crw overflow detected!\n", __FUNCTION__); 86 pr_debug("%s: crw overflow detected!\n", __func__);
87 css_schedule_eval_all(); 87 css_schedule_eval_all();
88 chain = 0; 88 chain = 0;
89 continue; 89 continue;
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 9e9f6c1e4e5d..45a7cd98c140 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -539,7 +539,7 @@ struct zfcp_rc_entry {
539 539
540/* logging routine for zfcp */ 540/* logging routine for zfcp */
541#define _ZFCP_LOG(fmt, args...) \ 541#define _ZFCP_LOG(fmt, args...) \
542 printk(KERN_ERR ZFCP_NAME": %s(%d): " fmt, __FUNCTION__, \ 542 printk(KERN_ERR ZFCP_NAME": %s(%d): " fmt, __func__, \
543 __LINE__ , ##args) 543 __LINE__ , ##args)
544 544
545#define ZFCP_LOG(level, fmt, args...) \ 545#define ZFCP_LOG(level, fmt, args...) \
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-15 14:35:17 -0500