openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: 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.


Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Acked-by: Mike Isely <isely@pobox.com>
Cc: linux-media@vger.kernel.org
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 017596b61f
commit 79510cdbc7
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/dvb/firewire/firedtv-1394.c
View File

@ -225,7 +225,7 @@ static int node_probe(struct device *dev)
static int node_remove(struct device *dev) static int node_remove(struct device *dev)
{ {
struct firedtv *fdtv = dev->driver_data; struct firedtv *fdtv = dev_get_drvdata(dev);
fdtv_dvb_unregister(fdtv); fdtv_dvb_unregister(fdtv);
@ -242,7 +242,7 @@ static int node_remove(struct device *dev)
static int node_update(struct unit_directory *ud) static int node_update(struct unit_directory *ud)
{ {
struct firedtv *fdtv = ud->device.driver_data; struct firedtv *fdtv = dev_get_drvdata(&ud->device);
if (fdtv->isochannel >= 0) if (fdtv->isochannel >= 0)
cmp_establish_pp_connection(fdtv, fdtv->subunit, cmp_establish_pp_connection(fdtv, fdtv->subunit,

2
drivers/media/dvb/firewire/firedtv-dvb.c
View File

@ -268,7 +268,7 @@ struct firedtv *fdtv_alloc(struct device *dev,
if (!fdtv) if (!fdtv)
return NULL; return NULL;
dev->driver_data = fdtv; dev_set_drvdata(dev, fdtv);
fdtv->device = dev; fdtv->device = dev;
fdtv->isochannel = -1; fdtv->isochannel = -1;
fdtv->voltage = 0xff; fdtv->voltage = 0xff;

22
drivers/media/video/pvrusb2/pvrusb2-sysfs.c
View File

@ -539,7 +539,7 @@ static void class_dev_destroy(struct pvr2_sysfs *sfp)
&sfp->attr_unit_number); &sfp->attr_unit_number);
} }
pvr2_sysfs_trace("Destroying class_dev id=%p",sfp->class_dev); pvr2_sysfs_trace("Destroying class_dev id=%p",sfp->class_dev);
sfp->class_dev->driver_data = NULL; dev_set_drvdata(sfp->class_dev, NULL);
device_unregister(sfp->class_dev); device_unregister(sfp->class_dev);
sfp->class_dev = NULL; sfp->class_dev = NULL;
} }
@ -549,7 +549,7 @@ static ssize_t v4l_minor_number_show(struct device *class_dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct pvr2_sysfs *sfp; struct pvr2_sysfs *sfp;
sfp = (struct pvr2_sysfs *)class_dev->driver_data; sfp = dev_get_drvdata(class_dev);
if (!sfp) return -EINVAL; if (!sfp) return -EINVAL;
return scnprintf(buf,PAGE_SIZE,"%d\n", return scnprintf(buf,PAGE_SIZE,"%d\n",
pvr2_hdw_v4l_get_minor_number(sfp->channel.hdw, pvr2_hdw_v4l_get_minor_number(sfp->channel.hdw,
@ -561,7 +561,7 @@ static ssize_t bus_info_show(struct device *class_dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct pvr2_sysfs *sfp; struct pvr2_sysfs *sfp;
sfp = (struct pvr2_sysfs *)class_dev->driver_data; sfp = dev_get_drvdata(class_dev);
if (!sfp) return -EINVAL; if (!sfp) return -EINVAL;
return scnprintf(buf,PAGE_SIZE,"%s\n", return scnprintf(buf,PAGE_SIZE,"%s\n",
pvr2_hdw_get_bus_info(sfp->channel.hdw)); pvr2_hdw_get_bus_info(sfp->channel.hdw));
@ -572,7 +572,7 @@ static ssize_t hdw_name_show(struct device *class_dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct pvr2_sysfs *sfp; struct pvr2_sysfs *sfp;
sfp = (struct pvr2_sysfs *)class_dev->driver_data; sfp = dev_get_drvdata(class_dev);
if (!sfp) return -EINVAL; if (!sfp) return -EINVAL;
return scnprintf(buf,PAGE_SIZE,"%s\n", return scnprintf(buf,PAGE_SIZE,"%s\n",
pvr2_hdw_get_type(sfp->channel.hdw)); pvr2_hdw_get_type(sfp->channel.hdw));
@ -583,7 +583,7 @@ static ssize_t hdw_desc_show(struct device *class_dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct pvr2_sysfs *sfp; struct pvr2_sysfs *sfp;
sfp = (struct pvr2_sysfs *)class_dev->driver_data; sfp = dev_get_drvdata(class_dev);
if (!sfp) return -EINVAL; if (!sfp) return -EINVAL;
return scnprintf(buf,PAGE_SIZE,"%s\n", return scnprintf(buf,PAGE_SIZE,"%s\n",
pvr2_hdw_get_desc(sfp->channel.hdw)); pvr2_hdw_get_desc(sfp->channel.hdw));
@ -595,7 +595,7 @@ static ssize_t v4l_radio_minor_number_show(struct device *class_dev,
char *buf) char *buf)
{ {
struct pvr2_sysfs *sfp; struct pvr2_sysfs *sfp;
sfp = (struct pvr2_sysfs *)class_dev->driver_data; sfp = dev_get_drvdata(class_dev);
if (!sfp) return -EINVAL; if (!sfp) return -EINVAL;
return scnprintf(buf,PAGE_SIZE,"%d\n", return scnprintf(buf,PAGE_SIZE,"%d\n",
pvr2_hdw_v4l_get_minor_number(sfp->channel.hdw, pvr2_hdw_v4l_get_minor_number(sfp->channel.hdw,
@ -607,7 +607,7 @@ static ssize_t unit_number_show(struct device *class_dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct pvr2_sysfs *sfp; struct pvr2_sysfs *sfp;
sfp = (struct pvr2_sysfs *)class_dev->driver_data; sfp = dev_get_drvdata(class_dev);
if (!sfp) return -EINVAL; if (!sfp) return -EINVAL;
return scnprintf(buf,PAGE_SIZE,"%d\n", return scnprintf(buf,PAGE_SIZE,"%d\n",
pvr2_hdw_get_unit_number(sfp->channel.hdw)); pvr2_hdw_get_unit_number(sfp->channel.hdw));
@ -635,7 +635,7 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
class_dev->parent = &usb_dev->dev; class_dev->parent = &usb_dev->dev;
sfp->class_dev = class_dev; sfp->class_dev = class_dev;
class_dev->driver_data = sfp; dev_set_drvdata(class_dev, sfp);
ret = device_register(class_dev); ret = device_register(class_dev);
if (ret) { if (ret) {
pvr2_trace(PVR2_TRACE_ERROR_LEGS, pvr2_trace(PVR2_TRACE_ERROR_LEGS,
@ -792,7 +792,7 @@ static ssize_t debuginfo_show(struct device *class_dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct pvr2_sysfs *sfp; struct pvr2_sysfs *sfp;
sfp = (struct pvr2_sysfs *)class_dev->driver_data; sfp = dev_get_drvdata(class_dev);
if (!sfp) return -EINVAL; if (!sfp) return -EINVAL;
pvr2_hdw_trigger_module_log(sfp->channel.hdw); pvr2_hdw_trigger_module_log(sfp->channel.hdw);
return pvr2_debugifc_print_info(sfp->channel.hdw,buf,PAGE_SIZE); return pvr2_debugifc_print_info(sfp->channel.hdw,buf,PAGE_SIZE);
@ -803,7 +803,7 @@ static ssize_t debugcmd_show(struct device *class_dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct pvr2_sysfs *sfp; struct pvr2_sysfs *sfp;
sfp = (struct pvr2_sysfs *)class_dev->driver_data; sfp = dev_get_drvdata(class_dev);
if (!sfp) return -EINVAL; if (!sfp) return -EINVAL;
return pvr2_debugifc_print_status(sfp->channel.hdw,buf,PAGE_SIZE); return pvr2_debugifc_print_status(sfp->channel.hdw,buf,PAGE_SIZE);
} }
@ -816,7 +816,7 @@ static ssize_t debugcmd_store(struct device *class_dev,
struct pvr2_sysfs *sfp; struct pvr2_sysfs *sfp;
int ret; int ret;
sfp = (struct pvr2_sysfs *)class_dev->driver_data; sfp = dev_get_drvdata(class_dev);
if (!sfp) return -EINVAL; if (!sfp) return -EINVAL;
ret = pvr2_debugifc_docmd(sfp->channel.hdw,buf,count); ret = pvr2_debugifc_docmd(sfp->channel.hdw,buf,count);