parport: remove driver_data direct access of struct device
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 4 May 2009 19:40:54 +0000 (12:40 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 16 Jun 2009 04:30:28 +0000 (21:30 -0700)
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: linux-kernel@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/parport/parport_gsc.c

index ea31a452b153e55e8ce378000e02ee952a5e8991..5d6de380e42ba87526cdfa2b87f658431223be86 100644 (file)
@@ -376,14 +376,14 @@ static int __devinit parport_init_chip(struct parisc_device *dev)
                        /* PARPORT_IRQ_NONE */ PARPORT_DMA_NONE, NULL);
        if (p)
                parport_count++;
-       dev->dev.driver_data = p;
+       dev_set_drvdata(&dev->dev, p);
 
        return 0;
 }
 
 static int __devexit parport_remove_chip(struct parisc_device *dev)
 {
-       struct parport *p = dev->dev.driver_data;
+       struct parport *p = dev_get_drvdata(&dev->dev);
        if (p) {
                struct parport_gsc_private *priv = p->private_data;
                struct parport_operations *ops = p->ops;