projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[powerpc.git]
/
drivers
/
serial
/
imx.c
diff --git
a/drivers/serial/imx.c
b/drivers/serial/imx.c
index
bdb4e45
..
355cd93
100644
(file)
--- a/
drivers/serial/imx.c
+++ b/
drivers/serial/imx.c
@@
-36,7
+36,7
@@
#include <linux/init.h>
#include <linux/console.h>
#include <linux/sysrq.h>
#include <linux/init.h>
#include <linux/console.h>
#include <linux/sysrq.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/serial_core.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/serial_core.h>
@@
-921,41
+921,39
@@
static struct uart_driver imx_reg = {
.cons = IMX_CONSOLE,
};
.cons = IMX_CONSOLE,
};
-static int serial_imx_suspend(struct
device *_dev, pm_message_t state, u32 level
)
+static int serial_imx_suspend(struct
platform_device *dev, pm_message_t state
)
{
{
- struct imx_port *sport =
dev_get_drvdata(_
dev);
+ struct imx_port *sport =
platform_get_drvdata(
dev);
- if (sport
&& level == SUSPEND_DISABLE
)
+ if (sport)
uart_suspend_port(&imx_reg, &sport->port);
return 0;
}
uart_suspend_port(&imx_reg, &sport->port);
return 0;
}
-static int serial_imx_resume(struct
device *_dev, u32 level
)
+static int serial_imx_resume(struct
platform_device *dev
)
{
{
- struct imx_port *sport =
dev_get_drvdata(_
dev);
+ struct imx_port *sport =
platform_get_drvdata(
dev);
- if (sport
&& level == RESUME_ENABLE
)
+ if (sport)
uart_resume_port(&imx_reg, &sport->port);
return 0;
}
uart_resume_port(&imx_reg, &sport->port);
return 0;
}
-static int serial_imx_probe(struct
device *_
dev)
+static int serial_imx_probe(struct
platform_device *
dev)
{
{
- struct platform_device *dev = to_platform_device(_dev);
-
- imx_ports[dev->id].port.dev = _dev;
+ imx_ports[dev->id].port.dev = &dev->dev;
uart_add_one_port(&imx_reg, &imx_ports[dev->id].port);
uart_add_one_port(&imx_reg, &imx_ports[dev->id].port);
-
dev_set_drvdata(_
dev, &imx_ports[dev->id]);
+
platform_set_drvdata(
dev, &imx_ports[dev->id]);
return 0;
}
return 0;
}
-static int serial_imx_remove(struct
device *_
dev)
+static int serial_imx_remove(struct
platform_device *
dev)
{
{
- struct imx_port *sport =
dev_get_drvdata(_
dev);
+ struct imx_port *sport =
platform_get_drvdata(
dev);
-
dev_set_drvdata(_
dev, NULL);
+
platform_set_drvdata(
dev, NULL);
if (sport)
uart_remove_one_port(&imx_reg, &sport->port);
if (sport)
uart_remove_one_port(&imx_reg, &sport->port);
@@
-963,14
+961,15
@@
static int serial_imx_remove(struct device *_dev)
return 0;
}
return 0;
}
-static struct device_driver serial_imx_driver = {
- .name = "imx-uart",
- .bus = &platform_bus_type,
+static struct platform_driver serial_imx_driver = {
.probe = serial_imx_probe,
.remove = serial_imx_remove,
.suspend = serial_imx_suspend,
.resume = serial_imx_resume,
.probe = serial_imx_probe,
.remove = serial_imx_remove,
.suspend = serial_imx_suspend,
.resume = serial_imx_resume,
+ .driver = {
+ .name = "imx-uart",
+ },
};
static int __init imx_serial_init(void)
};
static int __init imx_serial_init(void)
@@
-985,7
+984,7
@@
static int __init imx_serial_init(void)
if (ret)
return ret;
if (ret)
return ret;
- ret = driver_register(&serial_imx_driver);
+ ret =
platform_
driver_register(&serial_imx_driver);
if (ret != 0)
uart_unregister_driver(&imx_reg);
if (ret != 0)
uart_unregister_driver(&imx_reg);
@@
-995,6
+994,7
@@
static int __init imx_serial_init(void)
static void __exit imx_serial_exit(void)
{
uart_unregister_driver(&imx_reg);
static void __exit imx_serial_exit(void)
{
uart_unregister_driver(&imx_reg);
+ driver_unregister(&serial_imx_driver);
}
module_init(imx_serial_init);
}
module_init(imx_serial_init);