diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-30 18:18:08 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:20:58 -0400 |
commit | ca19d84295c2579229c5478db8b0f9cd7e821685 (patch) | |
tree | e3d8aa2a712da2fd0805e907395ea2f4ca7dc26b /drivers/media/dvb | |
parent | 413ef8a20ae4c12f2462385ac2eebf51a6feabea (diff) |
V4L/DVB (11739): remove driver_data direct access of struct device
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.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/firewire/firedtv-1394.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/firewire/firedtv-dvb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/firewire/firedtv-1394.c b/drivers/media/dvb/firewire/firedtv-1394.c index 4e207658c5d..2b6eeeab5b2 100644 --- a/drivers/media/dvb/firewire/firedtv-1394.c +++ b/drivers/media/dvb/firewire/firedtv-1394.c | |||
@@ -225,7 +225,7 @@ fail_free: | |||
225 | 225 | ||
226 | static int node_remove(struct device *dev) | 226 | static int node_remove(struct device *dev) |
227 | { | 227 | { |
228 | struct firedtv *fdtv = dev->driver_data; | 228 | struct firedtv *fdtv = dev_get_drvdata(dev); |
229 | 229 | ||
230 | fdtv_dvb_unregister(fdtv); | 230 | fdtv_dvb_unregister(fdtv); |
231 | 231 | ||
@@ -242,7 +242,7 @@ static int node_remove(struct device *dev) | |||
242 | 242 | ||
243 | static int node_update(struct unit_directory *ud) | 243 | static int node_update(struct unit_directory *ud) |
244 | { | 244 | { |
245 | struct firedtv *fdtv = ud->device.driver_data; | 245 | struct firedtv *fdtv = dev_get_drvdata(&ud->device); |
246 | 246 | ||
247 | if (fdtv->isochannel >= 0) | 247 | if (fdtv->isochannel >= 0) |
248 | cmp_establish_pp_connection(fdtv, fdtv->subunit, | 248 | cmp_establish_pp_connection(fdtv, fdtv->subunit, |
diff --git a/drivers/media/dvb/firewire/firedtv-dvb.c b/drivers/media/dvb/firewire/firedtv-dvb.c index 9d308dd32a5..5742fde79d9 100644 --- a/drivers/media/dvb/firewire/firedtv-dvb.c +++ b/drivers/media/dvb/firewire/firedtv-dvb.c | |||
@@ -268,7 +268,7 @@ struct firedtv *fdtv_alloc(struct device *dev, | |||
268 | if (!fdtv) | 268 | if (!fdtv) |
269 | return NULL; | 269 | return NULL; |
270 | 270 | ||
271 | dev->driver_data = fdtv; | 271 | dev_set_drvdata(dev, fdtv); |
272 | fdtv->device = dev; | 272 | fdtv->device = dev; |
273 | fdtv->isochannel = -1; | 273 | fdtv->isochannel = -1; |
274 | fdtv->voltage = 0xff; | 274 | fdtv->voltage = 0xff; |