From 5b1530d973cad10127d4f670bec49db724e4ac77 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 24 Jul 2013 15:05:32 -0700 Subject: [PATCH] video: output: convert class code to use dev_groups 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 Cc: Tomi Valkeinen Signed-off-by: Greg Kroah-Hartman Signed-off-by: Tomi Valkeinen --- drivers/video/output.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/video/output.c b/drivers/video/output.c index 6285b971845..1446c49fe6a 100644 --- a/drivers/video/output.c +++ b/drivers/video/output.c @@ -32,8 +32,8 @@ MODULE_DESCRIPTION("Display Output Switcher Lowlevel Control Abstraction"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Luming Yu "); -static ssize_t video_output_show_state(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t state_show(struct device *dev, struct device_attribute *attr, + char *buf) { ssize_t ret_size = 0; 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; } -static ssize_t video_output_store_state(struct device *dev, - struct device_attribute *attr, - const char *buf,size_t count) +static ssize_t state_store(struct device *dev, struct device_attribute *attr, + const char *buf,size_t count) { char *endp; struct output_device *od = to_output_device(dev); @@ -62,6 +61,7 @@ static ssize_t video_output_store_state(struct device *dev, } return count; } +static DEVICE_ATTR_RW(state); static void video_output_release(struct device *dev) { @@ -69,16 +69,16 @@ static void video_output_release(struct device *dev) kfree(od); } -static struct device_attribute video_output_attributes[] = { - __ATTR(state, 0644, video_output_show_state, video_output_store_state), - __ATTR_NULL, +static struct attribute *video_output_attrs[] = { + &dev_attr_state.attr, + NULL, }; - +ATTRIBUTE_GROUPS(video_output); static struct class video_output_class = { .name = "video_output", .dev_release = video_output_release, - .dev_attrs = video_output_attributes, + .dev_groups = video_output_groups, }; struct output_device *video_output_register(const char *name, -- 2.41.0