diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 03:16:55 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 03:16:55 +0200 |
| commit | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch) | |
| tree | 999c6a6580b76a083c8efb9dabff709d1c49fcd0 /drivers/serial | |
| parent | Merge commit 'origin/master' into next (diff) | |
| parent | Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6 (diff) | |
| download | linux-4b337c5f245b6587ba844ac7bb13c313a2912f7b.tar.xz linux-4b337c5f245b6587ba844ac7bb13c313a2912f7b.zip | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/of_serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c index 3f2027c70e46..02406ba6da1c 100644 --- 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: |