aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-28 05:14:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:34 -0400
commit156f1ed640170d70c9fc8e5f6f797ea1f2a1653b (patch)
tree4709685cf46fce1ef552ccbee6d30f5073f99216 /drivers
parentdd58c0dd30ac761837b1d0d8cc434c7ec7b2df68 (diff)
isdn: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/isdn/capi/capidrv.c4
-rw-r--r--drivers/isdn/capi/capilib.c2
-rw-r--r--drivers/isdn/capi/kcapi.c4
-rw-r--r--drivers/isdn/capi/kcapi.h2
-rw-r--r--drivers/isdn/hisax/asuscom.c2
-rw-r--r--drivers/isdn/hisax/avm_pci.c2
-rw-r--r--drivers/isdn/hisax/diva.c2
-rw-r--r--drivers/isdn/hisax/elsa.c2
-rw-r--r--drivers/isdn/hisax/hfc_sx.c2
-rw-r--r--drivers/isdn/hisax/hfc_usb.c6
-rw-r--r--drivers/isdn/hisax/hfcscard.c2
-rw-r--r--drivers/isdn/hisax/hisax_debug.h6
-rw-r--r--drivers/isdn/hisax/hisax_fcpcipnp.c2
-rw-r--r--drivers/isdn/hisax/ix1_micro.c2
-rw-r--r--drivers/isdn/hisax/niccy.c2
-rw-r--r--drivers/isdn/hisax/sedlbauer.c2
-rw-r--r--drivers/isdn/hisax/st5481.h10
-rw-r--r--drivers/isdn/hisax/teles3.c2
-rw-r--r--drivers/isdn/i4l/isdn_common.c2
-rw-r--r--drivers/isdn/i4l/isdn_net.h6
-rw-r--r--drivers/isdn/i4l/isdn_ppp.c32
-rw-r--r--drivers/isdn/i4l/isdn_tty.c6
22 files changed, 51 insertions, 51 deletions
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 2e602dd07ffa..d5b4cc357a3c 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -1388,12 +1388,12 @@ static void capidrv_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
1388 _cdebbuf *cdb = capi_cmsg2str(&s_cmsg); 1388 _cdebbuf *cdb = capi_cmsg2str(&s_cmsg);
1389 1389
1390 if (cdb) { 1390 if (cdb) {
1391 printk(KERN_DEBUG "%s: applid=%d %s\n", __FUNCTION__, 1391 printk(KERN_DEBUG "%s: applid=%d %s\n", __func__,
1392 ap->applid, cdb->buf); 1392 ap->applid, cdb->buf);
1393 cdebbuf_free(cdb); 1393 cdebbuf_free(cdb);
1394 } else 1394 } else
1395 printk(KERN_DEBUG "%s: applid=%d %s not traced\n", 1395 printk(KERN_DEBUG "%s: applid=%d %s not traced\n",
1396 __FUNCTION__, ap->applid, 1396 __func__, ap->applid,
1397 capi_cmd2str(s_cmsg.Command, s_cmsg.Subcommand)); 1397 capi_cmd2str(s_cmsg.Command, s_cmsg.Subcommand));
1398 } 1398 }
1399 if (s_cmsg.Command == CAPI_DATA_B3 1399 if (s_cmsg.Command == CAPI_DATA_B3
diff --git a/drivers/isdn/capi/capilib.c b/drivers/isdn/capi/capilib.c
index 34d8be2761c1..fcaa1241ee77 100644
--- a/drivers/isdn/capi/capilib.c
+++ b/drivers/isdn/capi/capilib.c
@@ -4,7 +4,7 @@
4#include <linux/isdn/capilli.h> 4#include <linux/isdn/capilli.h>
5 5
6#define DBG(format, arg...) do { \ 6#define DBG(format, arg...) do { \
7printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \ 7printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
8} while (0) 8} while (0)
9 9
10struct capilib_msgidqueue { 10struct capilib_msgidqueue {
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index ef6de217b9fc..063de5a29fcf 100644
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
@@ -154,7 +154,7 @@ static void register_appl(struct capi_ctr *card, u16 applid, capi_register_param
154 if (card) 154 if (card)
155 card->register_appl(card, applid, rparam); 155 card->register_appl(card, applid, rparam);
156 else 156 else
157 printk(KERN_WARNING "%s: cannot get card resources\n", __FUNCTION__); 157 printk(KERN_WARNING "%s: cannot get card resources\n", __func__);
158} 158}
159 159
160 160
@@ -178,7 +178,7 @@ static void notify_up(u32 contr)
178 printk(KERN_DEBUG "kcapi: notify up contr %d\n", contr); 178 printk(KERN_DEBUG "kcapi: notify up contr %d\n", contr);
179 } 179 }
180 if (!card) { 180 if (!card) {
181 printk(KERN_WARNING "%s: invalid contr %d\n", __FUNCTION__, contr); 181 printk(KERN_WARNING "%s: invalid contr %d\n", __func__, contr);
182 return; 182 return;
183 } 183 }
184 for (applid = 1; applid <= CAPI_MAXAPPL; applid++) { 184 for (applid = 1; applid <= CAPI_MAXAPPL; applid++) {
diff --git a/drivers/isdn/capi/kcapi.h b/drivers/isdn/capi/kcapi.h
index 1cb2c40f9921..244711f7f838 100644
--- a/drivers/isdn/capi/kcapi.h
+++ b/drivers/isdn/capi/kcapi.h
@@ -17,7 +17,7 @@
17 17
18#ifdef KCAPI_DEBUG 18#ifdef KCAPI_DEBUG
19#define DBG(format, arg...) do { \ 19#define DBG(format, arg...) do { \
20printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \ 20printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
21} while (0) 21} while (0)
22#else 22#else
23#define DBG(format, arg...) /* */ 23#define DBG(format, arg...) /* */
diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c
index b96f3184c2e5..1f879b500d83 100644
--- a/drivers/isdn/hisax/asuscom.c
+++ b/drivers/isdn/hisax/asuscom.c
@@ -344,7 +344,7 @@ setup_asuscom(struct IsdnCard *card)
344 err = pnp_activate_dev(pnp_d); 344 err = pnp_activate_dev(pnp_d);
345 if (err<0) { 345 if (err<0) {
346 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", 346 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
347 __FUNCTION__, err); 347 __func__, err);
348 return(0); 348 return(0);
349 } 349 }
350 card->para[1] = pnp_port_start(pnp_d, 0); 350 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 0f1db1f669b2..7cabc5a19492 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -797,7 +797,7 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs)
797 err = pnp_activate_dev(pnp_avm_d); 797 err = pnp_activate_dev(pnp_avm_d);
798 if (err<0) { 798 if (err<0) {
799 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", 799 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
800 __FUNCTION__, err); 800 __func__, err);
801 return(0); 801 return(0);
802 } 802 }
803 cs->hw.avm.cfg_reg = 803 cs->hw.avm.cfg_reg =
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 2d670856d141..018bd293e580 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -1088,7 +1088,7 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card)
1088 err = pnp_activate_dev(pnp_d); 1088 err = pnp_activate_dev(pnp_d);
1089 if (err<0) { 1089 if (err<0) {
1090 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", 1090 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
1091 __FUNCTION__, err); 1091 __func__, err);
1092 return(0); 1092 return(0);
1093 } 1093 }
1094 card->para[1] = pnp_port_start(pnp_d, 0); 1094 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 2c3691fda300..aa29d1cf16af 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -937,7 +937,7 @@ setup_elsa_isapnp(struct IsdnCard *card)
937 err = pnp_activate_dev(pnp_d); 937 err = pnp_activate_dev(pnp_d);
938 if (err<0) { 938 if (err<0) {
939 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", 939 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
940 __FUNCTION__, err); 940 __func__, err);
941 return(0); 941 return(0);
942 } 942 }
943 card->para[1] = pnp_port_start(pnp_d, 0); 943 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index f4a213877e35..d92e8d6c2ae2 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -1417,7 +1417,7 @@ setup_hfcsx(struct IsdnCard *card)
1417 err = pnp_activate_dev(pnp_d); 1417 err = pnp_activate_dev(pnp_d);
1418 if (err<0) { 1418 if (err<0) {
1419 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", 1419 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
1420 __FUNCTION__, err); 1420 __func__, err);
1421 return(0); 1421 return(0);
1422 } 1422 }
1423 card->para[1] = pnp_port_start(pnp_d, 0); 1423 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 98b0149bca68..8df889b0c1a9 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -905,7 +905,7 @@ rx_int_complete(struct urb *urb)
905 if (status) { 905 if (status) {
906 printk(KERN_INFO 906 printk(KERN_INFO
907 "HFC-S USB: %s error resubmitting URB fifo(%d)\n", 907 "HFC-S USB: %s error resubmitting URB fifo(%d)\n",
908 __FUNCTION__, fifon); 908 __func__, fifon);
909 } 909 }
910} 910}
911 911
@@ -1543,14 +1543,14 @@ hfc_usb_disconnect(struct usb_interface *intf)
1543 stop_isoc_chain(&context->fifos[i]); 1543 stop_isoc_chain(&context->fifos[i]);
1544 DBG(HFCUSB_DBG_INIT, 1544 DBG(HFCUSB_DBG_INIT,
1545 "HFC-S USB: %s stopping ISOC chain Fifo(%i)", 1545 "HFC-S USB: %s stopping ISOC chain Fifo(%i)",
1546 __FUNCTION__, i); 1546 __func__, i);
1547 } 1547 }
1548 } else { 1548 } else {
1549 if (context->fifos[i].active > 0) { 1549 if (context->fifos[i].active > 0) {
1550 context->fifos[i].active = 0; 1550 context->fifos[i].active = 0;
1551 DBG(HFCUSB_DBG_INIT, 1551 DBG(HFCUSB_DBG_INIT,
1552 "HFC-S USB: %s unlinking URB for Fifo(%i)", 1552 "HFC-S USB: %s unlinking URB for Fifo(%i)",
1553 __FUNCTION__, i); 1553 __func__, i);
1554 } 1554 }
1555 usb_kill_urb(context->fifos[i].urb); 1555 usb_kill_urb(context->fifos[i].urb);
1556 usb_free_urb(context->fifos[i].urb); 1556 usb_free_urb(context->fifos[i].urb);
diff --git a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c
index 909d6709ec16..cf082665cc8b 100644
--- a/drivers/isdn/hisax/hfcscard.c
+++ b/drivers/isdn/hisax/hfcscard.c
@@ -193,7 +193,7 @@ setup_hfcs(struct IsdnCard *card)
193 err = pnp_activate_dev(pnp_d); 193 err = pnp_activate_dev(pnp_d);
194 if (err<0) { 194 if (err<0) {
195 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", 195 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
196 __FUNCTION__, err); 196 __func__, err);
197 return(0); 197 return(0);
198 } 198 }
199 card->para[1] = pnp_port_start(pnp_d, 0); 199 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hisax_debug.h b/drivers/isdn/hisax/hisax_debug.h
index ceafecdb1037..5ed3b1c44184 100644
--- a/drivers/isdn/hisax/hisax_debug.h
+++ b/drivers/isdn/hisax/hisax_debug.h
@@ -27,14 +27,14 @@
27 27
28#define DBG(level, format, arg...) do { \ 28#define DBG(level, format, arg...) do { \
29if (level & __debug_variable) \ 29if (level & __debug_variable) \
30printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \ 30printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
31} while (0) 31} while (0)
32 32
33#define DBG_PACKET(level,data,count) \ 33#define DBG_PACKET(level,data,count) \
34 if (level & __debug_variable) dump_packet(__FUNCTION__,data,count) 34 if (level & __debug_variable) dump_packet(__func__,data,count)
35 35
36#define DBG_SKB(level,skb) \ 36#define DBG_SKB(level,skb) \
37 if ((level & __debug_variable) && skb) dump_packet(__FUNCTION__,skb->data,skb->len) 37 if ((level & __debug_variable) && skb) dump_packet(__func__,skb->data,skb->len)
38 38
39 39
40static void __attribute__((unused)) 40static void __attribute__((unused))
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 76043dedba5b..539b2e0c8254 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -935,7 +935,7 @@ static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_i
935 pnp_disable_dev(pdev); 935 pnp_disable_dev(pdev);
936 retval = pnp_activate_dev(pdev); 936 retval = pnp_activate_dev(pdev);
937 if (retval < 0) { 937 if (retval < 0) {
938 printk(KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n", __FUNCTION__, 938 printk(KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n", __func__,
939 (char *)dev_id->driver_data, retval); 939 (char *)dev_id->driver_data, retval);
940 goto err_free; 940 goto err_free;
941 } 941 }
diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
index 2d18d4f1e57e..a92bf0d2cab2 100644
--- a/drivers/isdn/hisax/ix1_micro.c
+++ b/drivers/isdn/hisax/ix1_micro.c
@@ -252,7 +252,7 @@ setup_ix1micro(struct IsdnCard *card)
252 err = pnp_activate_dev(pnp_d); 252 err = pnp_activate_dev(pnp_d);
253 if (err<0) { 253 if (err<0) {
254 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", 254 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
255 __FUNCTION__, err); 255 __func__, err);
256 return(0); 256 return(0);
257 } 257 }
258 card->para[1] = pnp_port_start(pnp_d, 0); 258 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index 421b8e6763d7..ef00633e1d2a 100644
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -255,7 +255,7 @@ int __devinit setup_niccy(struct IsdnCard *card)
255 err = pnp_activate_dev(pnp_d); 255 err = pnp_activate_dev(pnp_d);
256 if (err < 0) { 256 if (err < 0) {
257 printk(KERN_WARNING "%s: pnp_activate_dev " 257 printk(KERN_WARNING "%s: pnp_activate_dev "
258 "ret(%d)\n", __FUNCTION__, err); 258 "ret(%d)\n", __func__, err);
259 return 0; 259 return 0;
260 } 260 }
261 card->para[1] = pnp_port_start(pnp_d, 0); 261 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index 95425f3d2220..a10dfa82c734 100644
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -555,7 +555,7 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt)
555 err = pnp_activate_dev(pnp_d); 555 err = pnp_activate_dev(pnp_d);
556 if (err<0) { 556 if (err<0) {
557 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", 557 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
558 __FUNCTION__, err); 558 __func__, err);
559 return(0); 559 return(0);
560 } 560 }
561 card->para[1] = pnp_port_start(pnp_d, 0); 561 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h
index 04416bad611d..2044e7173ab4 100644
--- a/drivers/isdn/hisax/st5481.h
+++ b/drivers/isdn/hisax/st5481.h
@@ -218,13 +218,13 @@ enum {
218#define L1_EVENT_COUNT (EV_TIMER3 + 1) 218#define L1_EVENT_COUNT (EV_TIMER3 + 1)
219 219
220#define ERR(format, arg...) \ 220#define ERR(format, arg...) \
221printk(KERN_ERR "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) 221printk(KERN_ERR "%s:%s: " format "\n" , __FILE__, __func__ , ## arg)
222 222
223#define WARN(format, arg...) \ 223#define WARN(format, arg...) \
224printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) 224printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__, __func__ , ## arg)
225 225
226#define INFO(format, arg...) \ 226#define INFO(format, arg...) \
227printk(KERN_INFO "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) 227printk(KERN_INFO "%s:%s: " format "\n" , __FILE__, __func__ , ## arg)
228 228
229#include "isdnhdlc.h" 229#include "isdnhdlc.h"
230#include "fsm.h" 230#include "fsm.h"
@@ -406,7 +406,7 @@ struct st5481_adapter {
406 406
407/* 407/*
408 * Submit an URB with error reporting. This is a macro so 408 * Submit an URB with error reporting. This is a macro so
409 * the __FUNCTION__ returns the caller function name. 409 * the __func__ returns the caller function name.
410 */ 410 */
411#define SUBMIT_URB(urb, mem_flags) \ 411#define SUBMIT_URB(urb, mem_flags) \
412({ \ 412({ \
@@ -470,7 +470,7 @@ extern int st5481_debug;
470#ifdef CONFIG_HISAX_DEBUG 470#ifdef CONFIG_HISAX_DEBUG
471 471
472#define DBG_ISO_PACKET(level,urb) \ 472#define DBG_ISO_PACKET(level,urb) \
473 if (level & __debug_variable) dump_iso_packet(__FUNCTION__,urb) 473 if (level & __debug_variable) dump_iso_packet(__func__,urb)
474 474
475static void __attribute__((unused)) 475static void __attribute__((unused))
476dump_iso_packet(const char *name, struct urb *urb) 476dump_iso_packet(const char *name, struct urb *urb)
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
index 6a5e379e0774..5dc9f1a43629 100644
--- a/drivers/isdn/hisax/teles3.c
+++ b/drivers/isdn/hisax/teles3.c
@@ -301,7 +301,7 @@ setup_teles3(struct IsdnCard *card)
301 err = pnp_activate_dev(pnp_d); 301 err = pnp_activate_dev(pnp_d);
302 if (err<0) { 302 if (err<0) {
303 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", 303 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
304 __FUNCTION__, err); 304 __func__, err);
305 return(0); 305 return(0);
306 } 306 }
307 card->para[3] = pnp_port_start(pnp_d, 2); 307 card->para[3] = pnp_port_start(pnp_d, 2);
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index d4ad6992f776..0f3c66de69bc 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1924,7 +1924,7 @@ isdn_free_channel(int di, int ch, int usage)
1924 1924
1925 if ((di < 0) || (ch < 0)) { 1925 if ((di < 0) || (ch < 0)) {
1926 printk(KERN_WARNING "%s: called with invalid drv(%d) or channel(%d)\n", 1926 printk(KERN_WARNING "%s: called with invalid drv(%d) or channel(%d)\n",
1927 __FUNCTION__, di, ch); 1927 __func__, di, ch);
1928 return; 1928 return;
1929 } 1929 }
1930 for (i = 0; i < ISDN_MAX_CHANNELS; i++) 1930 for (i = 0; i < ISDN_MAX_CHANNELS; i++)
diff --git a/drivers/isdn/i4l/isdn_net.h b/drivers/isdn/i4l/isdn_net.h
index bc2f0dd962ea..be4949715d55 100644
--- a/drivers/isdn/i4l/isdn_net.h
+++ b/drivers/isdn/i4l/isdn_net.h
@@ -108,7 +108,7 @@ static __inline__ void isdn_net_add_to_bundle(isdn_net_dev *nd, isdn_net_local *
108 108
109 lp = nd->queue; 109 lp = nd->queue;
110// printk(KERN_DEBUG "%s: lp:%s(%p) nlp:%s(%p) last(%p)\n", 110// printk(KERN_DEBUG "%s: lp:%s(%p) nlp:%s(%p) last(%p)\n",
111// __FUNCTION__, lp->name, lp, nlp->name, nlp, lp->last); 111// __func__, lp->name, lp, nlp->name, nlp, lp->last);
112 nlp->last = lp->last; 112 nlp->last = lp->last;
113 lp->last->next = nlp; 113 lp->last->next = nlp;
114 lp->last = nlp; 114 lp->last = nlp;
@@ -129,7 +129,7 @@ static __inline__ void isdn_net_rm_from_bundle(isdn_net_local *lp)
129 master_lp = (isdn_net_local *) lp->master->priv; 129 master_lp = (isdn_net_local *) lp->master->priv;
130 130
131// printk(KERN_DEBUG "%s: lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n", 131// printk(KERN_DEBUG "%s: lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n",
132// __FUNCTION__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue); 132// __func__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue);
133 spin_lock_irqsave(&master_lp->netdev->queue_lock, flags); 133 spin_lock_irqsave(&master_lp->netdev->queue_lock, flags);
134 lp->last->next = lp->next; 134 lp->last->next = lp->next;
135 lp->next->last = lp->last; 135 lp->next->last = lp->last;
@@ -141,7 +141,7 @@ static __inline__ void isdn_net_rm_from_bundle(isdn_net_local *lp)
141 } 141 }
142 lp->next = lp->last = lp; /* (re)set own pointers */ 142 lp->next = lp->last = lp; /* (re)set own pointers */
143// printk(KERN_DEBUG "%s: mndq(%p)\n", 143// printk(KERN_DEBUG "%s: mndq(%p)\n",
144// __FUNCTION__, master_lp->netdev->queue); 144// __func__, master_lp->netdev->queue);
145 spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags); 145 spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags);
146} 146}
147 147
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 9f5fe372f83d..127cfdad68e7 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -110,7 +110,7 @@ isdn_ppp_free(isdn_net_local * lp)
110 110
111 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { 111 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
112 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n", 112 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n",
113 __FUNCTION__, lp->ppp_slot); 113 __func__, lp->ppp_slot);
114 return 0; 114 return 0;
115 } 115 }
116 116
@@ -127,7 +127,7 @@ isdn_ppp_free(isdn_net_local * lp)
127#endif /* CONFIG_ISDN_MPP */ 127#endif /* CONFIG_ISDN_MPP */
128 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { 128 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
129 printk(KERN_ERR "%s: ppp_slot(%d) now invalid\n", 129 printk(KERN_ERR "%s: ppp_slot(%d) now invalid\n",
130 __FUNCTION__, lp->ppp_slot); 130 __func__, lp->ppp_slot);
131 return 0; 131 return 0;
132 } 132 }
133 is = ippp_table[lp->ppp_slot]; 133 is = ippp_table[lp->ppp_slot];
@@ -226,7 +226,7 @@ isdn_ppp_wakeup_daemon(isdn_net_local * lp)
226{ 226{
227 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { 227 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
228 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n", 228 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n",
229 __FUNCTION__, lp->ppp_slot); 229 __func__, lp->ppp_slot);
230 return; 230 return;
231 } 231 }
232 ippp_table[lp->ppp_slot]->state = IPPP_OPEN | IPPP_CONNECT | IPPP_NOBLOCK; 232 ippp_table[lp->ppp_slot]->state = IPPP_OPEN | IPPP_CONNECT | IPPP_NOBLOCK;
@@ -245,7 +245,7 @@ isdn_ppp_closewait(int slot)
245 245
246 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 246 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
247 printk(KERN_ERR "%s: slot(%d) out of range\n", 247 printk(KERN_ERR "%s: slot(%d) out of range\n",
248 __FUNCTION__, slot); 248 __func__, slot);
249 return 0; 249 return 0;
250 } 250 }
251 is = ippp_table[slot]; 251 is = ippp_table[slot];
@@ -343,7 +343,7 @@ isdn_ppp_release(int min, struct file *file)
343 is = file->private_data; 343 is = file->private_data;
344 344
345 if (!is) { 345 if (!is) {
346 printk(KERN_ERR "%s: no file->private_data\n", __FUNCTION__); 346 printk(KERN_ERR "%s: no file->private_data\n", __func__);
347 return; 347 return;
348 } 348 }
349 if (is->debug & 0x1) 349 if (is->debug & 0x1)
@@ -353,7 +353,7 @@ isdn_ppp_release(int min, struct file *file)
353 isdn_net_dev *p = is->lp->netdev; 353 isdn_net_dev *p = is->lp->netdev;
354 354
355 if (!p) { 355 if (!p) {
356 printk(KERN_ERR "%s: no lp->netdev\n", __FUNCTION__); 356 printk(KERN_ERR "%s: no lp->netdev\n", __func__);
357 return; 357 return;
358 } 358 }
359 is->state &= ~IPPP_CONNECT; /* -> effect: no call of wakeup */ 359 is->state &= ~IPPP_CONNECT; /* -> effect: no call of wakeup */
@@ -1080,7 +1080,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff
1080 printk(KERN_DEBUG "isdn_ppp: VJC_UNCOMP\n"); 1080 printk(KERN_DEBUG "isdn_ppp: VJC_UNCOMP\n");
1081 if (net_dev->local->ppp_slot < 0) { 1081 if (net_dev->local->ppp_slot < 0) {
1082 printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n", 1082 printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n",
1083 __FUNCTION__, net_dev->local->ppp_slot); 1083 __func__, net_dev->local->ppp_slot);
1084 goto drop_packet; 1084 goto drop_packet;
1085 } 1085 }
1086 if (slhc_remember(ippp_table[net_dev->local->ppp_slot]->slcomp, skb->data, skb->len) <= 0) { 1086 if (slhc_remember(ippp_table[net_dev->local->ppp_slot]->slcomp, skb->data, skb->len) <= 0) {
@@ -1107,7 +1107,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff
1107 skb_old->len); 1107 skb_old->len);
1108 if (net_dev->local->ppp_slot < 0) { 1108 if (net_dev->local->ppp_slot < 0) {
1109 printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n", 1109 printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n",
1110 __FUNCTION__, net_dev->local->ppp_slot); 1110 __func__, net_dev->local->ppp_slot);
1111 goto drop_packet; 1111 goto drop_packet;
1112 } 1112 }
1113 pkt_len = slhc_uncompress(ippp_table[net_dev->local->ppp_slot]->slcomp, 1113 pkt_len = slhc_uncompress(ippp_table[net_dev->local->ppp_slot]->slcomp,
@@ -1553,7 +1553,7 @@ static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to )
1553 1553
1554 if (lp->ppp_slot < 0) { 1554 if (lp->ppp_slot < 0) {
1555 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", 1555 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
1556 __FUNCTION__, lp->ppp_slot); 1556 __func__, lp->ppp_slot);
1557 return(-EINVAL); 1557 return(-EINVAL);
1558 } 1558 }
1559 1559
@@ -1604,7 +1604,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
1604 slot = lp->ppp_slot; 1604 slot = lp->ppp_slot;
1605 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 1605 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
1606 printk(KERN_ERR "%s: lp->ppp_slot(%d)\n", 1606 printk(KERN_ERR "%s: lp->ppp_slot(%d)\n",
1607 __FUNCTION__, lp->ppp_slot); 1607 __func__, lp->ppp_slot);
1608 stats->frame_drops++; 1608 stats->frame_drops++;
1609 dev_kfree_skb(skb); 1609 dev_kfree_skb(skb);
1610 spin_unlock_irqrestore(&mp->lock, flags); 1610 spin_unlock_irqrestore(&mp->lock, flags);
@@ -1641,7 +1641,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
1641 slot = lpq->ppp_slot; 1641 slot = lpq->ppp_slot;
1642 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 1642 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
1643 printk(KERN_ERR "%s: lpq->ppp_slot(%d)\n", 1643 printk(KERN_ERR "%s: lpq->ppp_slot(%d)\n",
1644 __FUNCTION__, lpq->ppp_slot); 1644 __func__, lpq->ppp_slot);
1645 } else { 1645 } else {
1646 u32 lls = ippp_table[slot]->last_link_seqno; 1646 u32 lls = ippp_table[slot]->last_link_seqno;
1647 if (MP_LT(lls, minseq)) 1647 if (MP_LT(lls, minseq))
@@ -1875,7 +1875,7 @@ void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp,
1875 1875
1876 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { 1876 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
1877 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", 1877 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
1878 __FUNCTION__, lp->ppp_slot); 1878 __func__, lp->ppp_slot);
1879 return; 1879 return;
1880 } 1880 }
1881 if( MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG) ) { 1881 if( MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG) ) {
@@ -2655,7 +2655,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,
2655 lp->ppp_slot); 2655 lp->ppp_slot);
2656 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { 2656 if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
2657 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", 2657 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
2658 __FUNCTION__, lp->ppp_slot); 2658 __func__, lp->ppp_slot);
2659 return; 2659 return;
2660 } 2660 }
2661 is = ippp_table[lp->ppp_slot]; 2661 is = ippp_table[lp->ppp_slot];
@@ -2665,7 +2665,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,
2665 int slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot; 2665 int slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;
2666 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 2666 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
2667 printk(KERN_ERR "%s: slot(%d) out of range\n", 2667 printk(KERN_ERR "%s: slot(%d) out of range\n",
2668 __FUNCTION__, slot); 2668 __func__, slot);
2669 return; 2669 return;
2670 } 2670 }
2671 mis = ippp_table[slot]; 2671 mis = ippp_table[slot];
@@ -2829,7 +2829,7 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct
2829 return; 2829 return;
2830 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 2830 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
2831 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", 2831 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
2832 __FUNCTION__, slot); 2832 __func__, slot);
2833 return; 2833 return;
2834 } 2834 }
2835 is = ippp_table[slot]; 2835 is = ippp_table[slot];
@@ -2852,7 +2852,7 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct
2852 slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot; 2852 slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;
2853 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 2853 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
2854 printk(KERN_ERR "%s: slot(%d) out of range\n", 2854 printk(KERN_ERR "%s: slot(%d) out of range\n",
2855 __FUNCTION__, slot); 2855 __func__, slot);
2856 return; 2856 return;
2857 } 2857 }
2858 mis = ippp_table[slot]; 2858 mis = ippp_table[slot];
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 133eb18e65cc..8af0df1d5b8c 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1347,7 +1347,7 @@ isdn_tty_tiocmget(struct tty_struct *tty, struct file *file)
1347 modem_info *info = (modem_info *) tty->driver_data; 1347 modem_info *info = (modem_info *) tty->driver_data;
1348 u_char control, status; 1348 u_char control, status;
1349 1349
1350 if (isdn_tty_paranoia_check(info, tty->name, __FUNCTION__)) 1350 if (isdn_tty_paranoia_check(info, tty->name, __func__))
1351 return -ENODEV; 1351 return -ENODEV;
1352 if (tty->flags & (1 << TTY_IO_ERROR)) 1352 if (tty->flags & (1 << TTY_IO_ERROR))
1353 return -EIO; 1353 return -EIO;
@@ -1372,7 +1372,7 @@ isdn_tty_tiocmset(struct tty_struct *tty, struct file *file,
1372{ 1372{
1373 modem_info *info = (modem_info *) tty->driver_data; 1373 modem_info *info = (modem_info *) tty->driver_data;
1374 1374
1375 if (isdn_tty_paranoia_check(info, tty->name, __FUNCTION__)) 1375 if (isdn_tty_paranoia_check(info, tty->name, __func__))
1376 return -ENODEV; 1376 return -ENODEV;
1377 if (tty->flags & (1 << TTY_IO_ERROR)) 1377 if (tty->flags & (1 << TTY_IO_ERROR))
1378 return -EIO; 1378 return -EIO;
@@ -1608,7 +1608,7 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
1608 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_open")) 1608 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_open"))
1609 return -ENODEV; 1609 return -ENODEV;
1610 if (!try_module_get(info->owner)) { 1610 if (!try_module_get(info->owner)) {
1611 printk(KERN_WARNING "%s: cannot reserve module\n", __FUNCTION__); 1611 printk(KERN_WARNING "%s: cannot reserve module\n", __func__);
1612 return -ENODEV; 1612 return -ENODEV;
1613 } 1613 }
1614#ifdef ISDN_DEBUG_MODEM_OPEN 1614#ifdef ISDN_DEBUG_MODEM_OPEN
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-29 17:12:17 -0500