]> git.hungrycats.org Git - linux/commit
[PATCH] remove concat. with __FUNCTION__ (drivers/net/) (V2)
authorRandy Dunlap <rddunlap@osdl.org>
Tue, 13 Apr 2004 10:28:52 +0000 (06:28 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 13 Apr 2004 10:28:52 +0000 (06:28 -0400)
commitfb320b95ffb2f406ccff907f60704cd88ff2c047
tree738154b9caff36fa8fccab0ddf84dbedbf3362f2
parent6726212da221dc2e16e090a100ced7f95e6ea302
[PATCH] remove concat. with __FUNCTION__ (drivers/net/) (V2)

Hi,

Previous patch had a small problem.  This patch replaces the
previous version.  I can/will send a relative/differential diff
if you want/need it.

Problem:

On Tue, 2004-04-06 at 14:45, Randy.Dunlap wrote:
> From: Tony Breeds <tony@bakeyournoodle.com>
>
> "concatenation of string literals with __FUNCTION__ is deprecated"
> -#define TRACE_ENTER(devname) DEBUG(2, "%s: -> " __FUNCTION__ "()\n", devname);
> -#define TRACE_EXIT(devname)  DEBUG(2, "%s: <- " __FUNCTION__ "()\n", devname);
> +#define TRACE_ENTER(devname) DEBUG(2, "%s: -> %s()\n", __FUNCTION__, devname);
> +#define TRACE_EXIT(devname)  DEBUG(2, "%s: <- %s()\n", __FUNCTION__, devname);

| Hi.  This isn't the same.  It should be:
|
| +#define TRACE_ENTER(devname) DEBUG(2, "%s: -> %s()\n", devname, __FUNCTION__);
| +#define TRACE_EXIT(devname)  DEBUG(2, "%s: <- %s()\n", devname, __FUNCTION__ );

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 drivers/net/gt96100eth.c       |    2 +-
 drivers/net/irda/smsc-ircc2.c  |    6 +++---
 drivers/net/irda/via-ircc.c    |    2 +-
 drivers/net/wireless/orinoco.h |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/gt96100eth.c
drivers/net/irda/smsc-ircc2.c
drivers/net/irda/via-ircc.c
drivers/net/wireless/orinoco.h