Skip to contentSkip to conversation

of_serial: remove driver_data direct access of struct device

PATCH In review Greg Kroah-Hartman 4 participants 5 messages May 4, 2009 – May 11, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 of_serial: remove driver_data direct access of struct device

From: Greg Kroah-Hartman <[email protected]>

In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Matthias Fuchs <[email protected]>
---
 drivers/serial/of_serial.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/serial/of_serial.c +2 -2
@@ -122,7 +122,7 @@ static int __devinit of_platform_serial_
 
 	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:
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · On Mon, 4 May 2009 13:13:23 -0700 Greg Kroah-Hartman <[email protected]> wrote:

From: Greg Kroah-Hartman <[email protected]>

In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.

Quoted 6 lines
Cc Benjamin Herrenschmidt <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Matthias Fuchs <[email protected]>
Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#2 lore raw
Quoted 10 lines · Stephen Rothwell
Quoted 9 lines · On Mon, 4 May 2009 13:13:23 -0700 Greg Kroah-Hartman <[email protected]> wrote:

From: Greg Kroah-Hartman <[email protected]>

In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.

Quoted 8 lines
Quoted 6 lines
Cc Benjamin Herrenschmidt <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Matthias Fuchs <[email protected]>

Thanks, I've added this to the patch in my tree.

greg k-h

Acked-by on v1 1/1
#3 lore raw
In reply to Greg Kroah-Hartman
Quoted 8 lines · Greg Kroah-Hartman

From: Greg Kroah-Hartman <[email protected]>

In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.

Quoted 6 lines
Cc Benjamin Herrenschmidt <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Matthias Fuchs <[email protected]>
#4 lore raw
Quoted 9 lines · Arnd Bergmann
Quoted 8 lines · Greg Kroah-Hartman

From: Greg Kroah-Hartman <[email protected]>

In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.

Quoted 8 lines
Quoted 6 lines
Cc Benjamin Herrenschmidt <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Matthias Fuchs <[email protected]>

Thanks, I've added this to my original patch in my tree.

greg k-h