2.4.20pre5 trivial compiler warning fix for irtty.c

2.4.20pre5 trivial compiler warning fix for irtty.c

[Andreas Steinmetz]

[-- Attachment #1: Type: text/plain, Size: 133 bytes --]

the attached patch fixes deprecated usage warnings for __FUNCTION__ in 
irtty.c.
-- 
Andreas Steinmetz
D.O.M. Datenverarbeitung GmbH

[-- Attachment #2: irtty.c.diff --]
[-- Type: text/plain, Size: 1503 bytes --]

--- drivers/net/irda/irtty.c.orig	2002-09-05 22:49:01.000000000 +0200
+++ drivers/net/irda/irtty.c	2002-09-05 22:53:51.000000000 +0200
@@ -121,9 +121,8 @@
 	
 	/* Unregister tty line-discipline */
 	if ((ret = tty_register_ldisc(N_IRDA, NULL))) {
-		ERROR(__FUNCTION__ 
-		      "(), can't unregister line discipline (err = %d)\n",
-		      ret);
+		ERROR("%s(), can't unregister line discipline (err = %d)\n",
+		      __FUNCTION__,ret);
 	}
 
 	/*
@@ -230,7 +229,7 @@
 	self->rx_buff.data = self->rx_buff.head;
 	
 	if (!(dev = dev_alloc("irda%d", &err))) {
-		ERROR(__FUNCTION__ "(), dev_alloc() failed!\n");
+		ERROR("%s(), dev_alloc() failed!\n",__FUNCTION__);
 		return -ENOMEM;
 	}
 
@@ -249,7 +248,7 @@
 	err = register_netdevice(dev);
 	rtnl_unlock();
 	if (err) {
-		ERROR(__FUNCTION__ "(), register_netdev() failed!\n");
+		ERROR("%s(), register_netdev() failed!\n",__FUNCTION__);
 		return -1;
 	}
 
@@ -455,8 +454,8 @@
 			irda_task_next_state(task, IRDA_TASK_CHILD_DONE);
 		break;
 	case IRDA_TASK_CHILD_WAIT:
-		WARNING(__FUNCTION__ 
-			"(), changing speed of dongle timed out!\n");
+		WARNING("%s(), changing speed of dongle timed out!\n",
+			__FUNCTION__);
 		ret = -1;		
 		break;
 	case IRDA_TASK_CHILD_DONE:
@@ -467,7 +466,7 @@
 		self->task = NULL;
 		break;
 	default:
-		ERROR(__FUNCTION__ "(), unknown state %d\n", task->state);
+		ERROR("%s(), unknown state %d\n", __FUNCTION__, task->state);
 		irda_task_next_state(task, IRDA_TASK_DONE);
 		self->task = NULL;
 		ret = -1;

Re: 2.4.20pre5 trivial compiler warning fix for irtty.c

[Adrian Bunk]

On Thu, 5 Sep 2002, Andreas Steinmetz wrote:

> the attached patch fixes deprecated usage warnings for __FUNCTION__ in
> irtty.c.

Hi Andreas,

a similar patch is already in -ac. It's perhaps the best if you make such
patches against -ac because -ac contains several smaller cleanups and
fixes that aren't yet in 2.4.20pre.

cu
Adrian

-- 

You only think this is a free country. Like the US the UK spends a lot of
time explaining its a free country because its a police state.
								Alan Cox