evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

video: output: convert class code to use dev_groups

Browse source 
The dev_attrs field of struct class is going away soon, dev_groups
should be used instead.  This converts the video output class code to
use the correct field.

Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Greg Kroah-Hartman 2013-07-24 15:05:32 -07:00 • committed by Tomi Valkeinen
parent 3b2f64d00c
commit 5b1530d973
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/video/output.c
View file

@ -32,8 +32,8 @@ MODULE_DESCRIPTION("Display Output Switcher Lowlevel Control Abstraction");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Luming Yu <luming.yu@intel.com>"); MODULE_AUTHOR("Luming Yu <luming.yu@intel.com>");
static ssize_t video_output_show_state(struct device *dev, static ssize_t state_show(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, char *buf) char *buf)
{ {
ssize_t ret_size = 0; ssize_t ret_size = 0;
struct output_device *od = to_output_device(dev); struct output_device *od = to_output_device(dev);
@ -42,9 +42,8 @@ static ssize_t video_output_show_state(struct device *dev,
return ret_size; return ret_size;
} }
static ssize_t video_output_store_state(struct device *dev, static ssize_t state_store(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, const char *buf,size_t count)
const char *buf,size_t count)
{ {
char *endp; char *endp;
struct output_device *od = to_output_device(dev); struct output_device *od = to_output_device(dev);
@ -62,6 +61,7 @@ static ssize_t video_output_store_state(struct device *dev,
} }
return count; return count;
} }
static DEVICE_ATTR_RW(state);
static void video_output_release(struct device *dev) static void video_output_release(struct device *dev)
{ {
@ -69,16 +69,16 @@ static void video_output_release(struct device *dev)
kfree(od); kfree(od);
} }
static struct device_attribute video_output_attributes[] = { static struct attribute *video_output_attrs[] = {
__ATTR(state, 0644, video_output_show_state, video_output_store_state), &dev_attr_state.attr,
__ATTR_NULL, NULL,
}; };
ATTRIBUTE_GROUPS(video_output);
static struct class video_output_class = { static struct class video_output_class = {
.name = "video_output", .name = "video_output",
.dev_release = video_output_release, .dev_release = video_output_release,
.dev_attrs = video_output_attributes, .dev_groups = video_output_groups,
}; };
struct output_device *video_output_register(const char *name, struct output_device *video_output_register(const char *name,