Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 84635
b: refs/heads/master
c: 8b4a483
h: refs/heads/master
i:
  84633: db48a03
  84631: 04a8293
v: v3
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Feb 8, 2008
1 parent 2cb76c1 commit 2f10f3b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ce2e204f0c55567baa0323df8d327989d7113c66
refs/heads/master: 8b4a483be544569cd61156be86c0becf21a02e8b
17 changes: 8 additions & 9 deletions trunk/drivers/serial/8250_gsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@

#include "8250.h"

static int __init
serial_init_chip(struct parisc_device *dev)
static int __init serial_init_chip(struct parisc_device *dev)
{
struct uart_port port;
unsigned long address;
Expand All @@ -38,18 +37,17 @@ serial_init_chip(struct parisc_device *dev)
* what we have here is a missing parent device, so tell
* the user what they're missing.
*/
if (parisc_parent(dev)->id.hw_type != HPHW_IOA) {
printk(KERN_INFO "Serial: device 0x%lx not configured.\n"
if (parisc_parent(dev)->id.hw_type != HPHW_IOA)
printk(KERN_INFO
"Serial: device 0x%lx not configured.\n"
"Enable support for Wax, Lasi, Asp or Dino.\n",
dev->hpa.start);
}
return -ENODEV;
}

address = dev->hpa.start;
if (dev->id.sversion != 0x8d) {
if (dev->id.sversion != 0x8d)
address += 0x800;
}

memset(&port, 0, sizeof(port));
port.iotype = UPIO_MEM;
Expand All @@ -63,11 +61,12 @@ serial_init_chip(struct parisc_device *dev)

err = serial8250_register_port(&port);
if (err < 0) {
printk(KERN_WARNING "serial8250_register_port returned error %d\n", err);
printk(KERN_WARNING
"serial8250_register_port returned error %d\n", err);
iounmap(port.membase);
return err;
}

return 0;
}

Expand Down

0 comments on commit 2f10f3b

Please sign in to comment.