diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-09 16:25:01 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-09 16:25:01 -0700 |
| commit | 42bf72faa914ffb16c345329260bc54f15461036 (patch) | |
| tree | 8de3b15e3520388cfaab58bccc2cd655de49336a /video-output-convert-class-code-to-use-dev_groups.patch | |
| parent | 34a96ad13a22680781ae77e8065c2f96a3d1e43e (diff) | |
| download | patches-42bf72faa914ffb16c345329260bc54f15461036.tar.gz | |
renamed the final broken out patches
Diffstat (limited to 'video-output-convert-class-code-to-use-dev_groups.patch')
| -rw-r--r-- | video-output-convert-class-code-to-use-dev_groups.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/video-output-convert-class-code-to-use-dev_groups.patch b/video-output-convert-class-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..45756ed596e286 --- /dev/null +++ b/video-output-convert-class-code-to-use-dev_groups.patch @@ -0,0 +1,73 @@ +From foo@baz Tue Jul 9 16:16:53 PDT 2013 +Date: Tue, 09 Jul 2013 16:16:53 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + drivers/video/output.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- a/drivers/video/output.c ++++ b/drivers/video/output.c +@@ -32,8 +32,8 @@ MODULE_DESCRIPTION("Display Output Switc + 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,9 +42,8 @@ static ssize_t video_output_show_state(s + 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( + } + 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 + 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, |