From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932281AbVKVFTm (ORCPT ); Tue, 22 Nov 2005 00:19:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932305AbVKVFTl (ORCPT ); Tue, 22 Nov 2005 00:19:41 -0500 Received: from atlrel6.hp.com ([156.153.255.205]:26076 "EHLO atlrel6.hp.com") by vger.kernel.org with ESMTP id S932272AbVKVFTQ (ORCPT ); Tue, 22 Nov 2005 00:19:16 -0500 From: Matthew Wilcox To: Linus Torvalds , Andrew Morton Cc: Matthew Wilcox , Ingo Molnar , linux-kernel@vger.kernel.org, Russell King Subject: [PATCH 5/5] Report serial ports without an IRQ correctly Message-Id: Date: Tue, 22 Nov 2005 00:19:13 -0500 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Serial ports which have an IRQ set to NO_IRQ should report "polled" instead of "irq = -1" or "irq = 0" Signed-off-by: Matthew Wilcox --- drivers/serial/serial_core.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) applies-to: aa693abc4cf3b02945bdfdec1ddf14352c8b89c7 d83c67ef7a731df90db77d44542fad00a70cab53 diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index 2331296..a63b268 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c @@ -1961,6 +1961,7 @@ static inline void uart_report_port(struct uart_driver *drv, struct uart_port *port) { char address[64]; + char irq[16]; switch (port->iotype) { case UPIO_PORT: @@ -1982,10 +1983,16 @@ uart_report_port(struct uart_driver *drv break; } - printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n", + if (port->irq == NO_IRQ) { + strlcpy(irq, "polled", sizeof(irq)); + } else { + snprintf(irq, sizeof(irq), "irq = %d", port->irq); + } + + printk(KERN_INFO "%s%s%s%d at %s (%s) is a %s\n", port->dev ? port->dev->bus_id : "", port->dev ? ": " : "", - drv->dev_name, port->line, address, port->irq, uart_type(port)); + drv->dev_name, port->line, address, irq, uart_type(port)); } static void --- 0.99.8.GIT