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

Commit ea1bb706 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

video: backlight: 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 backlight class code to
use the correct field.

Cc: Richard Purdie <rpurdie@rpsys.net>
Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 92a3e661

drivers/video/backlight/backlight.c

+24 −20
Original line number Original line Diff line number Diff line
@@ -103,16 +103,16 @@ static void backlight_generate_event(struct backlight_device *bd, 
	sysfs_notify(&bd->dev.kobj, NULL, "actual_brightness");

	sysfs_notify(&bd->dev.kobj, NULL, "actual_brightness");

}

}





static ssize_t backlight_show_power(struct device *dev,

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

		struct device_attribute *attr, char *buf)

		char *buf)

{

{

	struct backlight_device *bd = to_backlight_device(dev);

	struct backlight_device *bd = to_backlight_device(dev);





	return sprintf(buf, "%d\n", bd->props.power);

	return sprintf(buf, "%d\n", bd->props.power);

}

}





static ssize_t backlight_store_power(struct device *dev,

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

		struct device_attribute *attr, const char *buf, size_t count)

		const char *buf, size_t count)

{

{

	int rc;

	int rc;

	struct backlight_device *bd = to_backlight_device(dev);

	struct backlight_device *bd = to_backlight_device(dev);
@@ -136,8 +136,9 @@ static ssize_t backlight_store_power(struct device *dev, 




	return rc;

	return rc;

}

}

static DEVICE_ATTR_RW(bl_power);





static ssize_t backlight_show_brightness(struct device *dev,

static ssize_t brightness_show(struct device *dev,

		struct device_attribute *attr, char *buf)

		struct device_attribute *attr, char *buf)

{

{

	struct backlight_device *bd = to_backlight_device(dev);

	struct backlight_device *bd = to_backlight_device(dev);
@@ -145,7 +146,7 @@ static ssize_t backlight_show_brightness(struct device *dev, 
	return sprintf(buf, "%d\n", bd->props.brightness);

	return sprintf(buf, "%d\n", bd->props.brightness);

}

}





static ssize_t backlight_store_brightness(struct device *dev,

static ssize_t brightness_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t count)

		struct device_attribute *attr, const char *buf, size_t count)

{

{

	int rc;

	int rc;
@@ -175,24 +176,27 @@ static ssize_t backlight_store_brightness(struct device *dev, 




	return rc;

	return rc;

}

}

static DEVICE_ATTR_RW(brightness);





static ssize_t backlight_show_type(struct device *dev,

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

		struct device_attribute *attr, char *buf)

		char *buf)

{

{

	struct backlight_device *bd = to_backlight_device(dev);

	struct backlight_device *bd = to_backlight_device(dev);





	return sprintf(buf, "%s\n", backlight_types[bd->props.type]);

	return sprintf(buf, "%s\n", backlight_types[bd->props.type]);

}

}

static DEVICE_ATTR_RO(type);





static ssize_t backlight_show_max_brightness(struct device *dev,

static ssize_t max_brightness_show(struct device *dev,

		struct device_attribute *attr, char *buf)

		struct device_attribute *attr, char *buf)

{

{

	struct backlight_device *bd = to_backlight_device(dev);

	struct backlight_device *bd = to_backlight_device(dev);





	return sprintf(buf, "%d\n", bd->props.max_brightness);

	return sprintf(buf, "%d\n", bd->props.max_brightness);

}

}

static DEVICE_ATTR_RO(max_brightness);





static ssize_t backlight_show_actual_brightness(struct device *dev,

static ssize_t actual_brightness_show(struct device *dev,

		struct device_attribute *attr, char *buf)

		struct device_attribute *attr, char *buf)

{

{

	int rc = -ENXIO;

	int rc = -ENXIO;
@@ -205,6 +209,7 @@ static ssize_t backlight_show_actual_brightness(struct device *dev, 




	return rc;

	return rc;

}

}

static DEVICE_ATTR_RO(actual_brightness);





static struct class *backlight_class;

static struct class *backlight_class;
@@ -247,16 +252,15 @@ static void bl_device_release(struct device *dev) 
	kfree(bd);

	kfree(bd);

}

}





static struct device_attribute bl_device_attributes[] = {

static struct attribute *bl_device_attrs[] = {

	__ATTR(bl_power, 0644, backlight_show_power, backlight_store_power),

	&dev_attr_bl_power.attr,

	__ATTR(brightness, 0644, backlight_show_brightness,

	&dev_attr_brightness.attr,

		     backlight_store_brightness),

	&dev_attr_actual_brightness.attr,

	__ATTR(actual_brightness, 0444, backlight_show_actual_brightness,

	&dev_attr_max_brightness.attr,

		     NULL),

	&dev_attr_type.attr,

	__ATTR(max_brightness, 0444, backlight_show_max_brightness, NULL),

	NULL,

	__ATTR(type, 0444, backlight_show_type, NULL),

	__ATTR_NULL,

};

};

ATTRIBUTE_GROUPS(bl_device);





/**

/**

 * backlight_force_update - tell the backlight subsystem that hardware state

 * backlight_force_update - tell the backlight subsystem that hardware state
@@ -493,7 +497,7 @@ static int __init backlight_class_init(void) 
		return PTR_ERR(backlight_class);

		return PTR_ERR(backlight_class);

	}

	}





	backlight_class->dev_attrs = bl_device_attributes;

	backlight_class->dev_groups = bl_device_groups;

	backlight_class->pm = &backlight_class_dev_pm_ops;

	backlight_class->pm = &backlight_class_dev_pm_ops;

	return 0;

	return 0;

}

}