Merge commit 'origin/master' into next

[linux-block.git] / drivers / serial / of_serial.c

diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index 3f2027c70e46fc1519d9d1b012592d2e2c95d570..02406ba6da1c565e7c88d58507da66ba6d0ec8df 100644 (file)
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -122,7 +122,7 @@ static int __devinit of_platform_serial_probe(struct of_device *ofdev,
 
        info->type = port_type;
        info->line = ret;
-       ofdev->dev.driver_data = info;
+       dev_set_drvdata(&ofdev->dev, info);
        return 0;
 out:
        kfree(info);
@@ -135,7 +135,7 @@ out:
  */
 static int of_platform_serial_remove(struct of_device *ofdev)
 {
-       struct of_serial_info *info = ofdev->dev.driver_data;
+       struct of_serial_info *info = dev_get_drvdata(&ofdev->dev);
        switch (info->type) {
 #ifdef CONFIG_SERIAL_8250
        case PORT_8250 ... PORT_MAX_8250: