4 files changed, 19 insertions, 9 deletions

diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c
index d8983dd5c4b2..85dc0410ac1a 100644
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
@@ -2162,7 +2162,7 @@ static struct ioc3_submodule ioc3uart_ops = {
 /**
  * ioc3_detect - module init called,
  */
-static int __devinit ioc3uart_init(void)
+static int __init ioc3uart_init(void)
 {
         int ret;
 
@@ -2179,7 +2179,7 @@ static int __devinit ioc3uart_init(void)
         return ret;
 }
 
-static void __devexit ioc3uart_exit(void)
+static void __exit ioc3uart_exit(void)
 {
         ioc3_unregister_submodule(&ioc3uart_ops);
         uart_unregister_driver(&ioc3_uart);
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index 2e02c3026d24..836d9ab4f729 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -2904,7 +2904,7 @@ static struct ioc4_submodule ioc4_serial_submodule = {
 /**
  * ioc4_serial_init - module init
  */
-int ioc4_serial_init(void)
+static int __init ioc4_serial_init(void)
 {
         int ret;
 
@@ -2913,20 +2913,30 @@ int ioc4_serial_init(void)
                 printk(KERN_WARNING
                         "%s: Couldn't register rs232 IOC4 serial driver\n",
                         __func__);
-                return ret;
+                goto out;
         }
         if ((ret = uart_register_driver(&ioc4_uart_rs422)) < 0) {
                 printk(KERN_WARNING
                         "%s: Couldn't register rs422 IOC4 serial driver\n",
                         __func__);
-                return ret;
+                goto out_uart_rs232;
         }
 
         /* register with IOC4 main module */
-        return ioc4_register_submodule(&ioc4_serial_submodule);
+        ret = ioc4_register_submodule(&ioc4_serial_submodule);
+        if (ret)
+                goto out_uart_rs422;
+        return 0;
+
+out_uart_rs422:
+        uart_unregister_driver(&ioc4_uart_rs422);
+out_uart_rs232:
+        uart_unregister_driver(&ioc4_uart_rs232);
+out:
+        return ret;
 }
 
-static void __devexit ioc4_serial_exit(void)
+static void __exit ioc4_serial_exit(void)
 {
         ioc4_unregister_submodule(&ioc4_serial_submodule);
         uart_unregister_driver(&ioc4_uart_rs232);
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 4a821046baae..56ee082157aa 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -756,7 +756,7 @@ static int serial_pxa_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops serial_pxa_pm_ops = {
+static const struct dev_pm_ops serial_pxa_pm_ops = {
         .suspend        = serial_pxa_suspend,
         .resume         = serial_pxa_resume,
 };
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index d96c7c7f1b22..68c7f6cfd728 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1344,7 +1344,7 @@ static int sci_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops sci_dev_pm_ops = {
+static const struct dev_pm_ops sci_dev_pm_ops = {
         .suspend        = sci_suspend,
         .resume         = sci_resume,
 };