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

Commit 9f59fbf0 authored by Phillip Raffeck's avatar Phillip Raffeck Committed by Greg Kroah-Hartman
Browse files

tty: serial: 8250: Suitably replace printk 



This patch replaces printk by the corresponding variant of dev_* in order
to fix checkpatch warnings. If no suitable device pointer is present, the
corresponding pr_* variant is used.

Signed-off-by: default avatarPhillip Raffeck <phillip.raffeck@fau.de>
Signed-off-by: default avatarAnton Würfel <anton.wuerfel@fau.de>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-kernel@i4.cs.fau.de
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90ad7c44

drivers/tty/serial/8250/8250_core.c

+2 −3
Original line number Diff line number Diff line
@@ -1099,9 +1099,8 @@ static int __init serial8250_init(void) 


	serial8250_isa_init_ports();



	printk(KERN_INFO "Serial: 8250/16550 driver, "

		"%d ports, IRQ sharing %sabled\n", nr_uarts,

		share_irqs ? "en" : "dis");

	pr_info("Serial: 8250/16550 driver, %d ports, IRQ sharing %sabled\n",

		nr_uarts, share_irqs ? "en" : "dis");



#ifdef CONFIG_SPARC

	ret = sunserial_register_minors(&serial8250_reg, UART_NR);

drivers/tty/serial/8250/8250_gsc.c

+4 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int __init serial_init_chip(struct parisc_device *dev) 
		 * the user what they're missing.

		 */

		if (parisc_parent(dev)->id.hw_type != HPHW_IOA)

			printk(KERN_INFO

			dev_info(&dev->dev,

				"Serial: device 0x%llx not configured.\n"

				"Enable support for Wax, Lasi, Asp or Dino.\n",

				(unsigned long long)dev->hpa.start);
@@ -66,8 +66,9 @@ static int __init serial_init_chip(struct parisc_device *dev) 


	err = serial8250_register_8250_port(&uart);

	if (err < 0) {

		printk(KERN_WARNING

			"serial8250_register_8250_port returned error %d\n", err);

		dev_warn(&dev->dev,

			"serial8250_register_8250_port returned error %d\n",

			err);

		iounmap(uart.port.membase);

		return err;

	}

drivers/tty/serial/8250/8250_hp300.c

+11 −9
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ int __init hp300_setup_serial_console(void) 
	/* Check for APCI console */

	if (scode == 256) {

#ifdef CONFIG_HPAPCI

		printk(KERN_INFO "Serial console is HP APCI 1\n");

		pr_info("Serial console is HP APCI 1\n");



		port.uartclk = HPAPCI_BAUD_BASE * 16;

		port.mapbase = (FRODO_BASE + FRODO_APCI_OFFSET(1));
@@ -118,7 +118,7 @@ int __init hp300_setup_serial_console(void) 
		port.regshift = 2;

		add_preferred_console("ttyS", port.line, "9600n8");

#else

		printk(KERN_WARNING "Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n");

		pr_warn("Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n");

		return 0;

#endif

	} else {
@@ -127,7 +127,7 @@ int __init hp300_setup_serial_console(void) 
		if (!pa)

			return 0;



		printk(KERN_INFO "Serial console is HP DCA at select code %d\n", scode);

		pr_info("Serial console is HP DCA at select code %d\n", scode);



		port.uartclk = HPDCA_BAUD_BASE * 16;

		port.mapbase = (pa + UART_OFFSET);
@@ -141,13 +141,13 @@ int __init hp300_setup_serial_console(void) 
		if (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80)

			add_preferred_console("ttyS", port.line, "9600n8");

#else

		printk(KERN_WARNING "Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n");

		pr_warn("Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n");

		return 0;

#endif

	}



	if (early_serial_setup(&port) < 0)

		printk(KERN_WARNING "hp300_setup_serial_console(): early_serial_setup() failed.\n");

		pr_warn("%s: early_serial_setup() failed.\n", __func__);

	return 0;

}

#endif /* CONFIG_SERIAL_8250_CONSOLE */
@@ -179,8 +179,9 @@ static int hpdca_init_one(struct dio_dev *d, 
	line = serial8250_register_8250_port(&uart);



	if (line < 0) {

		printk(KERN_NOTICE "8250_hp300: register_serial() DCA scode %d"

		       " irq %d failed\n", d->scode, uart.port.irq);

		dev_notice(&d->dev,

			  "8250_hp300: register_serial() DCA scode %d irq %d failed\n",

			  d->scode, uart.port.irq);

		return -ENOMEM;

	}
@@ -260,8 +261,9 @@ static int __init hp300_8250_init(void) 
		line = serial8250_register_8250_port(&uart);



		if (line < 0) {

			printk(KERN_NOTICE "8250_hp300: register_serial() APCI"

			       " %d irq %d failed\n", i, uart.port.irq);

			dev_notice(uart.port.dev,

				   "8250_hp300: register_serial() APCI %d irq %d failed\n",

				   i, uart.port.irq);

			kfree(port);

			continue;

		}

drivers/tty/serial/8250/8250_port.c

+1 −2
Original line number Diff line number Diff line
@@ -1316,8 +1316,7 @@ static void autoconfig(struct uart_8250_port *up) 
out_lock:

	spin_unlock_irqrestore(&port->lock, flags);

	if (up->capabilities != old_capabilities) {

		printk(KERN_WARNING

		       "ttyS%d: detected caps %08x should be %08x\n",

		pr_warn("ttyS%d: detected caps %08x should be %08x\n",

		       serial_index(port), old_capabilities,

		       up->capabilities);

	}