redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

pcmcia: remove driver_data direct access of struct device

Browse source 
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-pcmcia@lists.infradead.org
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2009-04-30 14:43:31 -07:00
parent 8952f593ea
commit f3e7a7b64a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/pcmcia/ds.c
View file

@ -394,7 +394,7 @@ static int pcmcia_device_probe(struct device * dev)
p_drv = to_pcmcia_drv(dev->driver); p_drv = to_pcmcia_drv(dev->driver);
s = p_dev->socket; s = p_dev->socket;
/* The PCMCIA code passes the match data in via dev->driver_data /* The PCMCIA code passes the match data in via dev_set_drvdata(dev)
* which is an ugly hack. Once the driver probe is called it may * which is an ugly hack. Once the driver probe is called it may
* and often will overwrite the match data so we must save it first * and often will overwrite the match data so we must save it first
* *
@ -404,7 +404,7 @@ static int pcmcia_device_probe(struct device * dev)
* call which will then check whether there are two * call which will then check whether there are two
* pseudo devices, and if not, add the second one. * pseudo devices, and if not, add the second one.
*/ */
did = p_dev->dev.driver_data; did = dev_get_drvdata(&p_dev->dev);
ds_dev_dbg(1, dev, "trying to bind to %s\n", p_drv->drv.name); ds_dev_dbg(1, dev, "trying to bind to %s\n", p_drv->drv.name);
@ -499,7 +499,7 @@ static int pcmcia_device_remove(struct device * dev)
* pseudo multi-function card, we need to unbind * pseudo multi-function card, we need to unbind
* all devices * all devices
*/ */
did = p_dev->dev.driver_data; did = dev_get_drvdata(&p_dev->dev);
if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) && if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
(p_dev->socket->device_count != 0) && (p_dev->socket->device_count != 0) &&
(p_dev->device_no == 0)) (p_dev->device_no == 0))
@ -978,7 +978,7 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
return 0; return 0;
} }
dev->dev.driver_data = (void *) did; dev_set_drvdata(&dev->dev, did);
return 1; return 1;
} }