Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b1530d9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Tomi Valkeinen
Browse files

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 <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 3b2f64d0

drivers/video/output.c

+10 −10
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ MODULE_DESCRIPTION("Display Output Switcher Lowlevel Control Abstraction"); 
MODULE_LICENSE("GPL");

MODULE_AUTHOR("Luming Yu <luming.yu@intel.com>");



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,8 +42,7 @@ 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,

static ssize_t state_store(struct device *dev, struct device_attribute *attr,

			   const char *buf,size_t count)

{

	char *endp;
@@ -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,