Commit 19d10a83 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Helge Deller

video: fbdev: omapfb: use default_groups in kobj_type

There are currently 2 ways to create a set of sysfs files for a
kobj_type, through the default_attrs field, and the default_groups
field.  Move the omapfb sysfs code to use default_groups field which has
been the preferred way since aa30f47c ("kobject: Add support for
default attribute groups to kobj_type") so that we can soon get rid of
the obsolete default_attrs field.

Cc: linux-omap@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 1ce48d67
...@@ -265,6 +265,7 @@ static struct attribute *display_sysfs_attrs[] = { ...@@ -265,6 +265,7 @@ static struct attribute *display_sysfs_attrs[] = {
&display_attr_wss.attr, &display_attr_wss.attr,
NULL NULL
}; };
ATTRIBUTE_GROUPS(display_sysfs);
static ssize_t display_attr_show(struct kobject *kobj, struct attribute *attr, static ssize_t display_attr_show(struct kobject *kobj, struct attribute *attr,
char *buf) char *buf)
...@@ -303,7 +304,7 @@ static const struct sysfs_ops display_sysfs_ops = { ...@@ -303,7 +304,7 @@ static const struct sysfs_ops display_sysfs_ops = {
static struct kobj_type display_ktype = { static struct kobj_type display_ktype = {
.sysfs_ops = &display_sysfs_ops, .sysfs_ops = &display_sysfs_ops,
.default_attrs = display_sysfs_attrs, .default_groups = display_sysfs_groups,
}; };
int display_init_sysfs(struct platform_device *pdev) int display_init_sysfs(struct platform_device *pdev)
......
...@@ -457,6 +457,7 @@ static struct attribute *manager_sysfs_attrs[] = { ...@@ -457,6 +457,7 @@ static struct attribute *manager_sysfs_attrs[] = {
&manager_attr_cpr_coef.attr, &manager_attr_cpr_coef.attr,
NULL NULL
}; };
ATTRIBUTE_GROUPS(manager_sysfs);
static ssize_t manager_attr_show(struct kobject *kobj, struct attribute *attr, static ssize_t manager_attr_show(struct kobject *kobj, struct attribute *attr,
char *buf) char *buf)
...@@ -495,7 +496,7 @@ static const struct sysfs_ops manager_sysfs_ops = { ...@@ -495,7 +496,7 @@ static const struct sysfs_ops manager_sysfs_ops = {
static struct kobj_type manager_ktype = { static struct kobj_type manager_ktype = {
.sysfs_ops = &manager_sysfs_ops, .sysfs_ops = &manager_sysfs_ops,
.default_attrs = manager_sysfs_attrs, .default_groups = manager_sysfs_groups,
}; };
int dss_manager_kobj_init(struct omap_overlay_manager *mgr, int dss_manager_kobj_init(struct omap_overlay_manager *mgr,
......
...@@ -390,6 +390,7 @@ static struct attribute *overlay_sysfs_attrs[] = { ...@@ -390,6 +390,7 @@ static struct attribute *overlay_sysfs_attrs[] = {
&overlay_attr_zorder.attr, &overlay_attr_zorder.attr,
NULL NULL
}; };
ATTRIBUTE_GROUPS(overlay_sysfs);
static ssize_t overlay_attr_show(struct kobject *kobj, struct attribute *attr, static ssize_t overlay_attr_show(struct kobject *kobj, struct attribute *attr,
char *buf) char *buf)
...@@ -428,7 +429,7 @@ static const struct sysfs_ops overlay_sysfs_ops = { ...@@ -428,7 +429,7 @@ static const struct sysfs_ops overlay_sysfs_ops = {
static struct kobj_type overlay_ktype = { static struct kobj_type overlay_ktype = {
.sysfs_ops = &overlay_sysfs_ops, .sysfs_ops = &overlay_sysfs_ops,
.default_attrs = overlay_sysfs_attrs, .default_groups = overlay_sysfs_groups,
}; };
int dss_overlay_kobj_init(struct omap_overlay *ovl, int dss_overlay_kobj_init(struct omap_overlay *ovl,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment