[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(-)

diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c
index 333ee371fd92c7363b6ed0421066048c86bbcaa1..9c84abba05676814d5a4844276059f690e6bfc56 100644 (file)
--- a/drivers/net/gt96100eth.c
+++ b/drivers/net/gt96100eth.c
@@ -1212,7 +1212,7 @@ gt96100_rx(struct net_device *dev, u32 status)
                    cmdstat, nextOut);
 
                if (cmdstat & (u32)rxOwn) {
-                       //err(__FUNCTION__ ": device owns descriptor!\n");
+                       //err("%s: device owns descriptor!\n", __FUNCTION__);
                        // DMA is not finished updating descriptor???
                        // Leave and come back later to pick-up where
                        // we left off.

diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index e57ec51ce2f6545f29d01483274283af044d6c1c..e360323c26658debe7423d8dfc68edcc8a9cb660 100644 (file)
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -1429,7 +1429,7 @@ static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *re
        }
 
        if (iir & IRCC_IIR_ACTIVE_FRAME) {
-               /*printk(KERN_WARNING __FUNCTION__ "(): Active Frame\n");*/
+               /*printk(KERN_WARNING "%s(): Active Frame\n", __FUNCTION__);*/
        }
 
        /* Enable interrupts again */
@@ -1995,7 +1995,7 @@ static int __init smsc_ircc_look_for_chips(void)
        while(address->cfg_base){
                cfg_base = address->cfg_base;
                
-               /*printk(KERN_WARNING __FUNCTION__ "(): probing: 0x%02x for: 0x%02x\n", cfg_base, address->type);*/
+               /*printk(KERN_WARNING "%s(): probing: 0x%02x for: 0x%02x\n", __FUNCTION__, cfg_base, address->type);*/
                
                if( address->type & SMSCSIO_TYPE_FDC){
                        type = "FDC";
@@ -2040,7 +2040,7 @@ static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfg
        outb(SMSCSIOFLAT_UARTMODE0C_REG, cfgbase);
        mode = inb(cfgbase+1);
        
-       /*printk(KERN_WARNING __FUNCTION__ "(): mode: 0x%02x\n", mode);*/
+       /*printk(KERN_WARNING "%s(): mode: 0x%02x\n", __FUNCTION__, mode);*/
        
        if(!(mode & SMSCSIOFLAT_UART2MODE_VAL_IRDA))
                WARNING("%s(): IrDA not enabled\n", __FUNCTION__);

diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 1e87f1c69f8882858a906adbe6fa9443e4df13e1..95b9c32514ecda4eeedc170eeb588e3c267b2adc 100644 (file)
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -360,7 +360,7 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id)
 
        /* Reserve the ioports that we need */
        if (!request_region(self->io.fir_base, self->io.fir_ext, driver_name)) {
-//              WARNING(__FUNCTION__ "(), can't get iobase of 0x%03x\n",self->io.fir_base);
+//              WARNING("%s(), can't get iobase of 0x%03x\n", __FUNCTION__, self->io.fir_base);
                err = -ENODEV;
                goto err_out1;
        }

diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h
index 6eb9e8541dc59d2615e6c099a868f0eea3b02272..972a8510f60fbc852f64d7b8429b5723e33d15cc 100644 (file)
--- a/drivers/net/wireless/orinoco.h
+++ b/drivers/net/wireless/orinoco.h
@@ -125,8 +125,8 @@ extern int orinoco_debug;
 #define DEBUG(n, args...) do { } while (0)
 #endif /* ORINOCO_DEBUG */
 
-#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", devname, __FUNCTION__);
+#define TRACE_EXIT(devname)  DEBUG(2, "%s: <- %s()\n", devname, __FUNCTION__);
 
 extern struct net_device *alloc_orinocodev(int sizeof_card,
                                           int (*hard_reset)(struct orinoco_private *));