mirror of
https://github.com/torvalds/linux
synced 2024-09-06 09:51:23 +00:00
drivers: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
bdf4bbaaee
commit
145980a0b0
|
@ -382,7 +382,7 @@ int gpio_direction_input(unsigned gpio)
|
|||
spin_unlock_irqrestore(&gpio_lock, flags);
|
||||
if (status)
|
||||
pr_debug("%s: gpio-%d status %d\n",
|
||||
__FUNCTION__, gpio, status);
|
||||
__func__, gpio, status);
|
||||
return status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(gpio_direction_input);
|
||||
|
@ -420,7 +420,7 @@ int gpio_direction_output(unsigned gpio, int value)
|
|||
spin_unlock_irqrestore(&gpio_lock, flags);
|
||||
if (status)
|
||||
pr_debug("%s: gpio-%d status %d\n",
|
||||
__FUNCTION__, gpio, status);
|
||||
__func__, gpio, status);
|
||||
return status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(gpio_direction_output);
|
||||
|
|
|
@ -224,7 +224,7 @@ static int ads7828_detect(struct i2c_adapter *adapter, int address, int kind)
|
|||
if (in_data & 0xF000) {
|
||||
printk(KERN_DEBUG
|
||||
"%s : Doesn't look like an ads7828 device\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
goto exit_free;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -132,7 +132,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
|
|||
|
||||
if (iter >= MAX_ASIC_ISR_LOOPS)
|
||||
printk(KERN_ERR "%s: interrupt processing overrun\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
}
|
||||
|
||||
static inline int asic3_irq_to_bank(struct asic3 *asic, int irq)
|
||||
|
@ -409,7 +409,7 @@ int asic3_gpio_get_value(struct asic3 *asic, unsigned gpio)
|
|||
return asic3_get_gpio_d(asic, Status) & mask;
|
||||
default:
|
||||
printk(KERN_ERR "%s: invalid GPIO value 0x%x",
|
||||
__FUNCTION__, gpio);
|
||||
__func__, gpio);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
@ -437,7 +437,7 @@ void asic3_gpio_set_value(struct asic3 *asic, unsigned gpio, int val)
|
|||
return;
|
||||
default:
|
||||
printk(KERN_ERR "%s: invalid GPIO value 0x%x",
|
||||
__FUNCTION__, gpio);
|
||||
__func__, gpio);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -349,11 +349,11 @@ int sm501_unit_power(struct device *dev, unsigned int unit, unsigned int to)
|
|||
mode &= 3; /* get current power mode */
|
||||
|
||||
if (unit >= ARRAY_SIZE(sm->unit_power)) {
|
||||
dev_err(dev, "%s: bad unit %d\n", __FUNCTION__, unit);
|
||||
dev_err(dev, "%s: bad unit %d\n", __func__, unit);
|
||||
goto already;
|
||||
}
|
||||
|
||||
dev_dbg(sm->dev, "%s: unit %d, cur %d, to %d\n", __FUNCTION__, unit,
|
||||
dev_dbg(sm->dev, "%s: unit %d, cur %d, to %d\n", __func__, unit,
|
||||
sm->unit_power[unit], to);
|
||||
|
||||
if (to == 0 && sm->unit_power[unit] == 0) {
|
||||
|
|
|
@ -365,11 +365,11 @@ static int __devinit parport_init_chip(struct parisc_device *dev)
|
|||
if (boot_cpu_data.cpu_type > pcxt && !pdc_add_valid(port+4)) {
|
||||
|
||||
/* Initialize bidirectional-mode (0x10) & data-tranfer-mode #1 (0x20) */
|
||||
printk("%s: initialize bidirectional-mode.\n", __FUNCTION__);
|
||||
printk("%s: initialize bidirectional-mode.\n", __func__);
|
||||
parport_writeb ( (0x10 + 0x20), port + 4);
|
||||
|
||||
} else {
|
||||
printk("%s: enhanced parport-modes not supported.\n", __FUNCTION__);
|
||||
printk("%s: enhanced parport-modes not supported.\n", __func__);
|
||||
}
|
||||
|
||||
p = parport_gsc_probe_port(port, 0, dev->irq,
|
||||
|
|
|
@ -1415,7 +1415,7 @@ static void __devinit winbond_check(int io, int key)
|
|||
{
|
||||
int devid,devrev,oldid,x_devid,x_devrev,x_oldid;
|
||||
|
||||
if (!request_region(io, 3, __FUNCTION__))
|
||||
if (!request_region(io, 3, __func__))
|
||||
return;
|
||||
|
||||
/* First probe without key */
|
||||
|
@ -1449,7 +1449,7 @@ static void __devinit winbond_check2(int io,int key)
|
|||
{
|
||||
int devid,devrev,oldid,x_devid,x_devrev,x_oldid;
|
||||
|
||||
if (!request_region(io, 3, __FUNCTION__))
|
||||
if (!request_region(io, 3, __func__))
|
||||
return;
|
||||
|
||||
/* First probe without the key */
|
||||
|
@ -1482,7 +1482,7 @@ static void __devinit smsc_check(int io, int key)
|
|||
{
|
||||
int id,rev,oldid,oldrev,x_id,x_rev,x_oldid,x_oldrev;
|
||||
|
||||
if (!request_region(io, 3, __FUNCTION__))
|
||||
if (!request_region(io, 3, __func__))
|
||||
return;
|
||||
|
||||
/* First probe without the key */
|
||||
|
@ -1547,7 +1547,7 @@ static void __devinit detect_and_report_it87(void)
|
|||
u8 r;
|
||||
if (verbose_probing)
|
||||
printk(KERN_DEBUG "IT8705 Super-IO detection, now testing port 2E ...\n");
|
||||
if (!request_region(0x2e, 1, __FUNCTION__))
|
||||
if (!request_region(0x2e, 1, __func__))
|
||||
return;
|
||||
outb(0x87, 0x2e);
|
||||
outb(0x01, 0x2e);
|
||||
|
|
|
@ -637,7 +637,7 @@ static int wd_inittimer(int whichdog)
|
|||
break;
|
||||
default:
|
||||
printk("%s: %s: invalid watchdog id: %i\n",
|
||||
WD_OBPNAME, __FUNCTION__, whichdog);
|
||||
WD_OBPNAME, __func__, whichdog);
|
||||
return(1);
|
||||
}
|
||||
if(0 != misc_register(whichmisc))
|
||||
|
|
|
@ -393,13 +393,13 @@ static int __init ts102_uctrl_init(void)
|
|||
err = request_irq(driver->irq, uctrl_interrupt, 0, "uctrl", driver);
|
||||
if (err) {
|
||||
printk("%s: unable to register irq %d\n",
|
||||
__FUNCTION__, driver->irq);
|
||||
__func__, driver->irq);
|
||||
return err;
|
||||
}
|
||||
|
||||
if (misc_register(&uctrl_dev)) {
|
||||
printk("%s: unable to get misc minor %d\n",
|
||||
__FUNCTION__, uctrl_dev.minor);
|
||||
__func__, uctrl_dev.minor);
|
||||
free_irq(driver->irq, driver);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
# define assert(expr) \
|
||||
if(unlikely(!(expr))) { \
|
||||
printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n", \
|
||||
#expr,__FILE__,__FUNCTION__,__LINE__); \
|
||||
#expr, __FILE__, __func__, __LINE__); \
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue