projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tty: remove use of __devinit
[deliverable/linux.git]
/
drivers
/
tty
/
serial
/
vt8500_serial.c
diff --git
a/drivers/tty/serial/vt8500_serial.c
b/drivers/tty/serial/vt8500_serial.c
index 205d4cf4a063bf404e126b97bcfb71c3d3ed3d87..80530c7d0025cf2f21dd2d04f58c368a116743e4 100644
(file)
--- a/
drivers/tty/serial/vt8500_serial.c
+++ b/
drivers/tty/serial/vt8500_serial.c
@@
-554,7
+554,7
@@
static struct uart_driver vt8500_uart_driver = {
.cons = VT8500_CONSOLE,
};
.cons = VT8500_CONSOLE,
};
-static int
__devinit
vt8500_serial_probe(struct platform_device *pdev)
+static int vt8500_serial_probe(struct platform_device *pdev)
{
struct vt8500_port *vt8500_port;
struct resource *mmres, *irqres;
{
struct vt8500_port *vt8500_port;
struct resource *mmres, *irqres;
@@
-567,10
+567,6
@@
static int __devinit vt8500_serial_probe(struct platform_device *pdev)
if (!mmres || !irqres)
return -ENODEV;
if (!mmres || !irqres)
return -ENODEV;
- vt8500_port = kzalloc(sizeof(struct vt8500_port), GFP_KERNEL);
- if (!vt8500_port)
- return -ENOMEM;
-
if (np)
port = of_alias_get_id(np, "serial");
if (port > VT8500_MAX_PORTS)
if (np)
port = of_alias_get_id(np, "serial");
if (port > VT8500_MAX_PORTS)
@@
-593,6
+589,10
@@
static int __devinit vt8500_serial_probe(struct platform_device *pdev)
return -EBUSY;
}
return -EBUSY;
}
+ vt8500_port = kzalloc(sizeof(struct vt8500_port), GFP_KERNEL);
+ if (!vt8500_port)
+ return -ENOMEM;
+
vt8500_port->uart.type = PORT_VT8500;
vt8500_port->uart.iotype = UPIO_MEM;
vt8500_port->uart.mapbase = mmres->start;
vt8500_port->uart.type = PORT_VT8500;
vt8500_port->uart.iotype = UPIO_MEM;
vt8500_port->uart.mapbase = mmres->start;
@@
-652,7
+652,7
@@
static const struct of_device_id wmt_dt_ids[] = {
static struct platform_driver vt8500_platform_driver = {
.probe = vt8500_serial_probe,
static struct platform_driver vt8500_platform_driver = {
.probe = vt8500_serial_probe,
- .remove =
__devexit_p(vt8500_serial_remove)
,
+ .remove =
vt8500_serial_remove
,
.driver = {
.name = "vt8500_serial",
.owner = THIS_MODULE,
.driver = {
.name = "vt8500_serial",
.owner = THIS_MODULE,
This page took
0.064386 seconds
and
5
git commands to generate.