Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 145980a0 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

drivers: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bdf4bbaa

drivers/gpio/gpiolib.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/hwmon/ads7828.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

			}

		}

drivers/mfd/asic3.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}

}

drivers/mfd/sm501.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {

drivers/parport/parport_gsc.c

+2 −2
Original line number Diff line number Diff line
@@ -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,