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

Commit 71cc2c21 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

serial: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bf9d8929

drivers/serial/68360serial.c

+2 −2
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ static int rs_360_tiocmget(struct tty_struct *tty, struct file *file) 
#ifdef modem_control

	unsigned char control, status;



	if (serial_paranoia_check(info, tty->name, __FUNCTION__))

	if (serial_paranoia_check(info, tty->name, __func__))

		return -ENODEV;



	if (tty->flags & (1 << TTY_IO_ERROR))
@@ -1278,7 +1278,7 @@ static int rs_360_tiocmset(struct tty_struct *tty, struct file *file, 
	ser_info_t *info = (ser_info_t *)tty->driver_data;

 	unsigned int arg;



	if (serial_paranoia_check(info, tty->name, __FUNCTION__))

	if (serial_paranoia_check(info, tty->name, __func__))

		return -ENODEV;



	if (tty->flags & (1 << TTY_IO_ERROR))

drivers/serial/8250_early.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int __init parse_options(struct early_serial8250_device *device, 
		port->membase = ioremap(port->mapbase, 64);

		if (!port->membase) {

			printk(KERN_ERR "%s: Couldn't ioremap 0x%llx\n",

				__FUNCTION__,

				__func__,

			       (unsigned long long)port->mapbase);

			return -ENOMEM;

		}

drivers/serial/bfin_5xx.c

+2 −2
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios, 
		break;

	default:

		printk(KERN_ERR "%s: word lengh not supported\n",

			__FUNCTION__);

			__func__);

	}



	if (termios->c_cflag & CSTOPB)
@@ -1029,7 +1029,7 @@ bfin_serial_console_get_options(struct bfin_serial_port *uart, int *baud, 


		*baud = get_sclk() / (16*(dll | dlh << 8));

	}

	pr_debug("%s:baud = %d, parity = %c, bits= %d\n", __FUNCTION__, *baud, *parity, *bits);

	pr_debug("%s:baud = %d, parity = %c, bits= %d\n", __func__, *baud, *parity, *bits);

}

#endif

drivers/serial/cpm_uart/cpm_uart_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ int cpm_uart_drv_get_platform_data(struct platform_device *pdev, int is_con) 


	line = cpm_uart_id2nr(idx);

	if(line < 0) {

		printk(KERN_ERR"%s(): port %d is not registered", __FUNCTION__, idx);

		printk(KERN_ERR"%s(): port %d is not registered", __func__, idx);

		return -EINVAL;

	}

drivers/serial/crisv10.c

+4 −4
Original line number Diff line number Diff line
@@ -1788,7 +1788,7 @@ static unsigned int handle_descr_data(struct e100_serial *info, 


	if (info->recv_cnt + recvl > 65536) {

		printk(KERN_CRIT

		       "%s: Too much pending incoming serial data! Dropping %u bytes.\n", __FUNCTION__, recvl);

		       "%s: Too much pending incoming serial data! Dropping %u bytes.\n", __func__, recvl);

		return 0;

	}
@@ -1801,7 +1801,7 @@ static unsigned int handle_descr_data(struct e100_serial *info, 
	append_recv_buffer(info, buffer);



	if (!(buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE)))

		panic("%s: Failed to allocate memory for receive buffer!\n", __FUNCTION__);

		panic("%s: Failed to allocate memory for receive buffer!\n", __func__);



	descr->buf = virt_to_phys(buffer->buffer);
@@ -1925,7 +1925,7 @@ static int start_recv_dma(struct e100_serial *info) 
	/* Set up the receiving descriptors */

	for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++) {

		if (!(buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE)))

			panic("%s: Failed to allocate memory for receive buffer!\n", __FUNCTION__);

			panic("%s: Failed to allocate memory for receive buffer!\n", __func__);



		descr[i].ctrl = d_int;

		descr[i].buf = virt_to_phys(buffer->buffer);
@@ -4519,7 +4519,7 @@ rs_init(void) 


	if (request_irq(SERIAL_IRQ_NBR, ser_interrupt,

			IRQF_SHARED | IRQF_DISABLED, "serial ", driver))

		panic("%s: Failed to request irq8", __FUNCTION__);

		panic("%s: Failed to request irq8", __func__);



#endif

#endif /* CONFIG_SVINTO_SIM */