diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2009-01-07 22:31:57 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 23:48:54 (GMT) |
commit | d599edcaea987e233fad808f88850f725e8a5530 (patch) | |
tree | 5e9336d4882232ae7296355cd2d21ed0aff86f8f /drivers/staging/meilhaus | |
parent | 9b4778f680aa79d838ae2be6ab958938f744ce5f (diff) | |
download | linux-fsl-qoriq-d599edcaea987e233fad808f88850f725e8a5530.tar.xz |
staging: __FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/staging/meilhaus')
-rw-r--r-- | drivers/staging/meilhaus/me0600_ext_irq.c | 4 | ||||
-rw-r--r-- | drivers/staging/meilhaus/me1400_ext_irq.c | 2 | ||||
-rw-r--r-- | drivers/staging/meilhaus/me1600_ao.c | 4 | ||||
-rw-r--r-- | drivers/staging/meilhaus/me4600_ai.c | 8 | ||||
-rw-r--r-- | drivers/staging/meilhaus/me4600_ao.c | 6 | ||||
-rw-r--r-- | drivers/staging/meilhaus/me4600_ext_irq.c | 2 | ||||
-rw-r--r-- | drivers/staging/meilhaus/me6000_ao.c | 20 | ||||
-rw-r--r-- | drivers/staging/meilhaus/me8100_di.c | 6 | ||||
-rw-r--r-- | drivers/staging/meilhaus/me8200_di.c | 4 | ||||
-rw-r--r-- | drivers/staging/meilhaus/me8200_do.c | 2 | ||||
-rw-r--r-- | drivers/staging/meilhaus/medebug.h | 10 |
11 files changed, 34 insertions, 34 deletions
diff --git a/drivers/staging/meilhaus/me0600_ext_irq.c b/drivers/staging/meilhaus/me0600_ext_irq.c index a449ab2..eba18ad 100644 --- a/drivers/staging/meilhaus/me0600_ext_irq.c +++ b/drivers/staging/meilhaus/me0600_ext_irq.c @@ -360,7 +360,7 @@ static irqreturn_t me0600_isr(int irq, void *dev_id, struct pt_regs *regs) if (instance->lintno > 1) { PERROR_CRITICAL ("%s():Wrong subdevice index=%d plx:irq_status_reg=0x%04X.\n", - __FUNCTION__, instance->lintno, inl(instance->intcsr)); + __func__, instance->lintno, inl(instance->intcsr)); return IRQ_NONE; } @@ -384,7 +384,7 @@ static irqreturn_t me0600_isr(int irq, void *dev_id, struct pt_regs *regs) } else { PINFO ("%ld Shared interrupt. %s(): idx=0 plx:irq_status_reg=0x%04X\n", - jiffies, __FUNCTION__, status); + jiffies, __func__, status); ret = IRQ_NONE; } spin_unlock(instance->intcsr_lock); diff --git a/drivers/staging/meilhaus/me1400_ext_irq.c b/drivers/staging/meilhaus/me1400_ext_irq.c index b8c2696..b4df7cc 100644 --- a/drivers/staging/meilhaus/me1400_ext_irq.c +++ b/drivers/staging/meilhaus/me1400_ext_irq.c @@ -349,7 +349,7 @@ static irqreturn_t me1400_ext_irq_isr(int irq, void *dev_id, (PLX_LOCAL_INT1_STATE | PLX_LOCAL_INT1_EN | PLX_PCI_INT_EN)) { spin_unlock(&instance->subdevice_lock); PINFO("%ld Shared interrupt. %s(): irq_status_reg=0x%04X\n", - jiffies, __FUNCTION__, status); + jiffies, __func__, status); return IRQ_NONE; } diff --git a/drivers/staging/meilhaus/me1600_ao.c b/drivers/staging/meilhaus/me1600_ao.c index 6f26665..d127c6b 100644 --- a/drivers/staging/meilhaus/me1600_ao.c +++ b/drivers/staging/meilhaus/me1600_ao.c @@ -977,7 +977,7 @@ static void me1600_ao_work_control_task(struct work_struct *work) container_of((void *)work, me1600_ao_subdevice_t, ao_control_task); #endif - PINFO("<%s: %ld> executed. idx=%d\n", __FUNCTION__, jiffies, + PINFO("<%s: %ld> executed. idx=%d\n", __func__, jiffies, instance->ao_idx); if (!((instance->ao_regs_shadows)->trigger & instance->ao_idx)) { // Output was triggerd. @@ -1027,7 +1027,7 @@ static void me1600_ao_work_control_task(struct work_struct *work) queue_delayed_work(instance->me1600_workqueue, &instance->ao_control_task, 1); } else { - PINFO("<%s> Ending control task.\n", __FUNCTION__); + PINFO("<%s> Ending control task.\n", __func__); } } diff --git a/drivers/staging/meilhaus/me4600_ai.c b/drivers/staging/meilhaus/me4600_ai.c index 1a0de5d..0a8c9d7 100644 --- a/drivers/staging/meilhaus/me4600_ai.c +++ b/drivers/staging/meilhaus/me4600_ai.c @@ -2629,11 +2629,11 @@ static irqreturn_t me4600_ai_isr(int irq, void *dev_id, struct pt_regs *regs) if ((irq_status & (ME4600_IRQ_STATUS_BIT_AI_HF | ME4600_IRQ_STATUS_BIT_SC | ME4600_IRQ_STATUS_BIT_LE)) == ME4600_IRQ_STATUS_BIT_LE) { //This is security check case. LE is unused. This should never ever happend. PINFO ("%ld Shared interrupt. %s(): irq_status_reg=LE_IRQ\n", - jiffies, __FUNCTION__); + jiffies, __func__); } else { PINFO ("%ld Shared interrupt. %s(): irq_status_reg=0x%04X\n", - jiffies, __FUNCTION__, irq_status); + jiffies, __func__, irq_status); } #endif return IRQ_NONE; @@ -3329,7 +3329,7 @@ static void me4600_ai_work_control_task(struct work_struct *work) instance = container_of((void *)work, me4600_ai_subdevice_t, ai_control_task); #endif - PINFO("<%s: %ld> executed.\n", __FUNCTION__, jiffies); + PINFO("<%s: %ld> executed.\n", __func__, jiffies); status = inl(instance->status_reg); PDEBUG_REG("status_reg inl(0x%lX+0x%lX)=0x%x\n", instance->reg_base, @@ -3428,7 +3428,7 @@ static void me4600_ai_work_control_task(struct work_struct *work) queue_delayed_work(instance->me4600_workqueue, &instance->ai_control_task, 1); } else { - PINFO("<%s> Ending control task.\n", __FUNCTION__); + PINFO("<%s> Ending control task.\n", __func__); } } diff --git a/drivers/staging/meilhaus/me4600_ao.c b/drivers/staging/meilhaus/me4600_ao.c index 2c92e65..e2bec82 100644 --- a/drivers/staging/meilhaus/me4600_ao.c +++ b/drivers/staging/meilhaus/me4600_ao.c @@ -2294,7 +2294,7 @@ static irqreturn_t me4600_ao_isr(int irq, void *dev_id irq_status = inl(instance->irq_status_reg); if (!(irq_status & (ME4600_IRQ_STATUS_BIT_AO_HF << instance->ao_idx))) { PINFO("%ld Shared interrupt. %s(): ID=%d: status_reg=0x%04X\n", - jiffies, __FUNCTION__, instance->ao_idx, irq_status); + jiffies, __func__, instance->ao_idx, irq_status); return IRQ_NONE; } @@ -3009,7 +3009,7 @@ static void me4600_ao_work_control_task( instance = container_of((void *)work, me4600_ao_subdevice_t, ao_control_task); #endif - PINFO("<%s: %ld> executed. idx=%d\n", __FUNCTION__, jiffies, + PINFO("<%s: %ld> executed. idx=%d\n", __func__, jiffies, instance->ao_idx); status = inl(instance->status_reg); @@ -3316,7 +3316,7 @@ static void me4600_ao_work_control_task( queue_delayed_work(instance->me4600_workqueue, &instance->ao_control_task, 1); } else { - PINFO("<%s> Ending control task.\n", __FUNCTION__); + PINFO("<%s> Ending control task.\n", __func__); } } diff --git a/drivers/staging/meilhaus/me4600_ext_irq.c b/drivers/staging/meilhaus/me4600_ext_irq.c index 8a10dce..adc1e1b 100644 --- a/drivers/staging/meilhaus/me4600_ext_irq.c +++ b/drivers/staging/meilhaus/me4600_ext_irq.c @@ -356,7 +356,7 @@ static irqreturn_t me4600_ext_irq_isr(int irq, void *dev_id, irq_status = inl(instance->irq_status_reg); if (!(irq_status & ME4600_IRQ_STATUS_BIT_EX)) { PINFO("%ld Shared interrupt. %s(): irq_status_reg=0x%04X\n", - jiffies, __FUNCTION__, irq_status); + jiffies, __func__, irq_status); return IRQ_NONE; } diff --git a/drivers/staging/meilhaus/me6000_ao.c b/drivers/staging/meilhaus/me6000_ao.c index 3f5ff6d..94f0123 100644 --- a/drivers/staging/meilhaus/me6000_ao.c +++ b/drivers/staging/meilhaus/me6000_ao.c @@ -863,7 +863,7 @@ static int me6000_ao_io_single_write(me_subdevice_t * subdevice, /// @note When flag 'ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS' is set than output is triggered. ALWAYS! - PINFO("<%s> start mode= 0x%08x %s\n", __FUNCTION__, mode, + PINFO("<%s> start mode= 0x%08x %s\n", __func__, mode, (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) ? "SYNCHRONOUS" : ""); if (instance->fifo & ME6000_AO_HAS_FIFO) { // FIFO - Continous mode @@ -1663,7 +1663,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice, status = inl(instance->status_reg); //Start state machine and interrupts - PINFO("<%s:%d> Start state machine.\n", __FUNCTION__, __LINE__); + PINFO("<%s:%d> Start state machine.\n", __func__, __LINE__); ctrl &= ~(ME6000_AO_CTRL_BIT_STOP | ME6000_AO_CTRL_BIT_IMMEDIATE_STOP); if (instance->start_mode == ME6000_AO_EXT_TRIG) { PDEBUG("DIGITAL TRIGGER\n"); @@ -1671,7 +1671,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice, } if (!(status & ME6000_AO_STATUS_BIT_HF)) { //More than half! if ((ctrl & ME6000_AO_CTRL_MODE_MASK) == ME6000_AO_MODE_CONTINUOUS) { //Enable IRQ only when hardware_continous is set and FIFO is more than half - PINFO("<%s:%d> Start interrupts.\n", __FUNCTION__, + PINFO("<%s:%d> Start interrupts.\n", __func__, __LINE__); ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ; } @@ -1682,7 +1682,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice, spin_unlock_irqrestore(&instance->subdevice_lock, cpu_flags); //Trigger output - PINFO("<%s> start mode= 0x%x %s\n", __FUNCTION__, instance->start_mode, + PINFO("<%s> start mode= 0x%x %s\n", __func__, instance->start_mode, (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) ? "SYNCHRONOUS" : ""); if (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) { //Trigger outputs @@ -1777,7 +1777,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice, status = inl(instance->status_reg); if (!(status & ME6000_AO_STATUS_BIT_HF)) { //More than half! spin_lock_irqsave(&instance->subdevice_lock, cpu_flags); - PINFO("<%s:%d> Start interrupts.\n", __FUNCTION__, + PINFO("<%s:%d> Start interrupts.\n", __func__, __LINE__); ctrl = inl(instance->ctrl_reg); ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ; @@ -1819,7 +1819,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice, spin_lock_irqsave(&instance->subdevice_lock, cpu_flags); PINFO("<%s:%d> Start interrupts.\n", - __FUNCTION__, __LINE__); + __func__, __LINE__); ctrl = inl(instance->ctrl_reg); ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ; outl(ctrl, instance->ctrl_reg); @@ -2346,7 +2346,7 @@ static irqreturn_t me6000_ao_isr(int irq, void *dev_id, struct pt_regs *regs) irq_status = inl(instance->irq_status_reg); if (!(irq_status & (ME6000_IRQ_STATUS_BIT_AO_HF << instance->ao_idx))) { PINFO("%ld Shared interrupt. %s(): ID=%d: status_reg=0x%04X\n", - jiffies, __FUNCTION__, instance->ao_idx, irq_status); + jiffies, __func__, instance->ao_idx, irq_status); return IRQ_NONE; } @@ -2861,7 +2861,7 @@ int inline ao_stop_immediately(me6000_ao_subdevice_t * instance) } } - PINFO("<%s> Wait for stop: %d\n", __FUNCTION__, i); + PINFO("<%s> Wait for stop: %d\n", __func__, i); //Still working! set_current_state(TASK_INTERRUPTIBLE); @@ -3132,7 +3132,7 @@ static void me6000_ao_work_control_task( instance = container_of((void *)work, me6000_ao_subdevice_t, ao_control_task); #endif - PINFO("<%s: %ld> executed. idx=%d\n", __FUNCTION__, jiffies, + PINFO("<%s: %ld> executed. idx=%d\n", __func__, jiffies, instance->ao_idx); status = inl(instance->status_reg); @@ -3550,7 +3550,7 @@ static void me6000_ao_work_control_task( queue_delayed_work(instance->me6000_workqueue, &instance->ao_control_task, 1); } else { - PINFO("<%s> Ending control task.\n", __FUNCTION__); + PINFO("<%s> Ending control task.\n", __func__); } } diff --git a/drivers/staging/meilhaus/me8100_di.c b/drivers/staging/meilhaus/me8100_di.c index 0f14637..971727c 100644 --- a/drivers/staging/meilhaus/me8100_di.c +++ b/drivers/staging/meilhaus/me8100_di.c @@ -536,7 +536,7 @@ static irqreturn_t me8100_isr(int irq, void *dev_id, struct pt_regs *regs) PLX_INTCSR_LOCAL_INT1_EN)) { PINFO ("%ld Shared interrupt. %s(): idx=0 plx:irq_status_reg=0x%04X\n", - jiffies, __FUNCTION__, icsr); + jiffies, __func__, icsr); return IRQ_NONE; } } else if (instance->di_idx == 1) { @@ -547,11 +547,11 @@ static irqreturn_t me8100_isr(int irq, void *dev_id, struct pt_regs *regs) PLX_INTCSR_LOCAL_INT2_EN)) { PINFO ("%ld Shared interrupt. %s(): idx=1 plx:irq_status_reg=0x%04X\n", - jiffies, __FUNCTION__, icsr); + jiffies, __func__, icsr); return IRQ_NONE; } } else { - PERROR("%s():Wrong interrupt idx=%d csr=0x%X.\n", __FUNCTION__, + PERROR("%s():Wrong interrupt idx=%d csr=0x%X.\n", __func__, instance->di_idx, icsr); return IRQ_NONE; } diff --git a/drivers/staging/meilhaus/me8200_di.c b/drivers/staging/meilhaus/me8200_di.c index 0bb4567..27525bc 100644 --- a/drivers/staging/meilhaus/me8200_di.c +++ b/drivers/staging/meilhaus/me8200_di.c @@ -570,7 +570,7 @@ static irqreturn_t me8200_isr(int irq, void *dev_id, struct pt_regs *regs) if (!irq_status) { PINFO ("%ld Shared interrupt. %s(): idx=%d irq_status_reg=0x%04X\n", - jiffies, __FUNCTION__, instance->di_idx, irq_status); + jiffies, __func__, instance->di_idx, irq_status); return IRQ_NONE; } @@ -658,7 +658,7 @@ static irqreturn_t me8200_isr_EX(int irq, void *dev_id, struct pt_regs *regs) if (!irq_status) { PINFO ("%ld Shared interrupt. %s(): idx=%d irq_status_reg=0x%04X\n", - jiffies, __FUNCTION__, instance->di_idx, irq_status); + jiffies, __func__, instance->di_idx, irq_status); return IRQ_NONE; } diff --git a/drivers/staging/meilhaus/me8200_do.c b/drivers/staging/meilhaus/me8200_do.c index 5f4ba5d..d2bebd1 100644 --- a/drivers/staging/meilhaus/me8200_do.c +++ b/drivers/staging/meilhaus/me8200_do.c @@ -475,7 +475,7 @@ static irqreturn_t me8200_do_isr(int irq, void *dev_id, struct pt_regs *regs) (ME8200_DO_IRQ_STATUS_BIT_ACTIVE << instance->do_idx))) { PINFO ("%ld Shared interrupt. %s(): idx=%d irq_status_reg=0x%04X\n", - jiffies, __FUNCTION__, instance->do_idx, irq_status); + jiffies, __func__, instance->do_idx, irq_status); return IRQ_NONE; } diff --git a/drivers/staging/meilhaus/medebug.h b/drivers/staging/meilhaus/medebug.h index 382d00f..dcfb97c 100644 --- a/drivers/staging/meilhaus/medebug.h +++ b/drivers/staging/meilhaus/medebug.h @@ -66,21 +66,21 @@ #ifdef MEDEBUG_DEBUG # define PDEBUG(fmt, args...) \ - printk(KERN_DEBUG"ME_DRV D: <%s> " fmt, __FUNCTION__, ##args) + printk(KERN_DEBUG"ME_DRV D: <%s> " fmt, __func__, ##args) #else # define PDEBUG(fmt, args...) #endif #ifdef MEDEBUG_DEBUG_LOCKS # define PDEBUG_LOCKS(fmt, args...) \ - printk(KERN_DEBUG"ME_DRV L: <%s> " fmt, __FUNCTION__, ##args) + printk(KERN_DEBUG"ME_DRV L: <%s> " fmt, __func__, ##args) #else # define PDEBUG_LOCKS(fmt, args...) #endif #ifdef MEDEBUG_DEBUG_REG # define PDEBUG_REG(fmt, args...) \ - printk(KERN_DEBUG"ME_DRV R: <%s:%d> REG:" fmt, __FUNCTION__, __LINE__, ##args) + printk(KERN_DEBUG"ME_DRV R: <%s:%d> REG:" fmt, __func__, __LINE__, ##args) #else # define PDEBUG_REG(fmt, args...) #endif @@ -108,7 +108,7 @@ //This debug is only to detect logical errors! # define PSECURITY(fmt, args...) \ - printk(KERN_CRIT"ME_DRV SECURITY: <%s:%s:%i> " fmt, __FILE__, __FUNCTION__, __LINE__, ##args) + printk(KERN_CRIT"ME_DRV SECURITY: <%s:%s:%i> " fmt, __FILE__, __func__, __LINE__, ##args) //This debug is to keep track in customers' system # define PLOG(fmt, args...) \ printk(KERN_INFO"ME_DRV: " fmt, ##args) @@ -116,7 +116,7 @@ //This debug is to check new parts during development #ifdef MEDEBUG_DEVELOP # define PDEVELOP(fmt, args...) \ - printk(KERN_CRIT"ME_DRV: <%s:%s:%i> " fmt, __FILE__, __FUNCTION__, __LINE__, ##args) + printk(KERN_CRIT"ME_DRV: <%s:%s:%i> " fmt, __FILE__, __func__, __LINE__, ##args) #else # define PDEVELOP(fmt, args...) #endif |