From 1a577d9f78416e628239d6b566d13b0dc708bee4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 May 2009 12:40:54 -0700 Subject: [PATCH] --- yaml --- r: 151285 b: refs/heads/master c: 3cf62a5a82f9819896d72b20f8c55e0858c7aec8 h: refs/heads/master i: 151283: 11cd93baa781ce7d4117a3cce9abbcc733529f52 v: v3 --- [refs] | 2 +- trunk/drivers/serial/of_serial.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0c51ce05adef..11504e29b905 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7792065590ab1fd0a9f06ffaab3dc237a30b339 +refs/heads/master: 3cf62a5a82f9819896d72b20f8c55e0858c7aec8 diff --git a/trunk/drivers/serial/of_serial.c b/trunk/drivers/serial/of_serial.c index 14f8fa9135be..54483cd3529e 100644 --- a/trunk/drivers/serial/of_serial.c +++ b/trunk/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 @@ static int __devinit of_platform_serial_probe(struct of_device *ofdev, */ 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: