projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
asm-generic: remove fastcall
[powerpc.git]
/
drivers
/
serial
/
sunhv.c
diff --git
a/drivers/serial/sunhv.c
b/drivers/serial/sunhv.c
index
8ff900b
..
be0fe15
100644
(file)
--- a/
drivers/serial/sunhv.c
+++ b/
drivers/serial/sunhv.c
@@
-562,16
+562,10
@@
static int __devinit hv_probe(struct of_device *op, const struct of_device_id *m
port->dev = &op->dev;
port->dev = &op->dev;
- sunhv_reg.minor = sunserial_current_minor;
- sunhv_reg.nr = 1;
-
- err = uart_register_driver(&sunhv_reg);
+ err = sunserial_register_minors(&sunhv_reg, 1);
if (err)
goto out_free_con_read_page;
if (err)
goto out_free_con_read_page;
- sunhv_reg.tty_driver->name_base = sunhv_reg.minor - 64;
- sunserial_current_minor += 1;
-
sunserial_console_match(&sunhv_console, op->node,
&sunhv_reg, port->line);
sunserial_console_match(&sunhv_console, op->node,
&sunhv_reg, port->line);
@@
-591,8
+585,7
@@
out_remove_port:
uart_remove_one_port(&sunhv_reg, port);
out_unregister_driver:
uart_remove_one_port(&sunhv_reg, port);
out_unregister_driver:
- sunserial_current_minor -= 1;
- uart_unregister_driver(&sunhv_reg);
+ sunserial_unregister_minors(&sunhv_reg, 1);
out_free_con_read_page:
kfree(con_read_page);
out_free_con_read_page:
kfree(con_read_page);
@@
-614,8
+607,7
@@
static int __devexit hv_remove(struct of_device *dev)
uart_remove_one_port(&sunhv_reg, port);
uart_remove_one_port(&sunhv_reg, port);
- sunserial_current_minor -= 1;
- uart_unregister_driver(&sunhv_reg);
+ sunserial_unregister_minors(&sunhv_reg, 1);
kfree(port);
sunhv_port = NULL;
kfree(port);
sunhv_port = NULL;