diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/8250_gsc.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/serial/8250_gsc.c b/drivers/serial/8250_gsc.c index c5d0addfda4f..4eb7437a404a 100644 --- a/drivers/serial/8250_gsc.c +++ b/drivers/serial/8250_gsc.c | |||
@@ -25,8 +25,7 @@ | |||
25 | 25 | ||
26 | #include "8250.h" | 26 | #include "8250.h" |
27 | 27 | ||
28 | static int __init | 28 | static int __init serial_init_chip(struct parisc_device *dev) |
29 | serial_init_chip(struct parisc_device *dev) | ||
30 | { | 29 | { |
31 | struct uart_port port; | 30 | struct uart_port port; |
32 | unsigned long address; | 31 | unsigned long address; |
@@ -38,18 +37,17 @@ serial_init_chip(struct parisc_device *dev) | |||
38 | * what we have here is a missing parent device, so tell | 37 | * what we have here is a missing parent device, so tell |
39 | * the user what they're missing. | 38 | * the user what they're missing. |
40 | */ | 39 | */ |
41 | if (parisc_parent(dev)->id.hw_type != HPHW_IOA) { | 40 | if (parisc_parent(dev)->id.hw_type != HPHW_IOA) |
42 | printk(KERN_INFO "Serial: device 0x%lx not configured.\n" | 41 | printk(KERN_INFO |
42 | "Serial: device 0x%lx not configured.\n" | ||
43 | "Enable support for Wax, Lasi, Asp or Dino.\n", | 43 | "Enable support for Wax, Lasi, Asp or Dino.\n", |
44 | dev->hpa.start); | 44 | dev->hpa.start); |
45 | } | ||
46 | return -ENODEV; | 45 | return -ENODEV; |
47 | } | 46 | } |
48 | 47 | ||
49 | address = dev->hpa.start; | 48 | address = dev->hpa.start; |
50 | if (dev->id.sversion != 0x8d) { | 49 | if (dev->id.sversion != 0x8d) |
51 | address += 0x800; | 50 | address += 0x800; |
52 | } | ||
53 | 51 | ||
54 | memset(&port, 0, sizeof(port)); | 52 | memset(&port, 0, sizeof(port)); |
55 | port.iotype = UPIO_MEM; | 53 | port.iotype = UPIO_MEM; |
@@ -63,11 +61,12 @@ serial_init_chip(struct parisc_device *dev) | |||
63 | 61 | ||
64 | err = serial8250_register_port(&port); | 62 | err = serial8250_register_port(&port); |
65 | if (err < 0) { | 63 | if (err < 0) { |
66 | printk(KERN_WARNING "serial8250_register_port returned error %d\n", err); | 64 | printk(KERN_WARNING |
65 | "serial8250_register_port returned error %d\n", err); | ||
67 | iounmap(port.membase); | 66 | iounmap(port.membase); |
68 | return err; | 67 | return err; |
69 | } | 68 | } |
70 | 69 | ||
71 | return 0; | 70 | return 0; |
72 | } | 71 | } |
73 | 72 | ||