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

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

video: backlight: lcd: 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 lcd 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 ea1bb706

drivers/video/backlight/lcd.c

+15 −11
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ static inline void lcd_unregister_fb(struct lcd_device *ld) 
}

}

#endif /* CONFIG_FB */

#endif /* CONFIG_FB */





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

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

		char *buf)

		char *buf)

{

{

	int rc;

	int rc;
@@ -105,7 +105,7 @@ static ssize_t lcd_show_power(struct device *dev, struct device_attribute *attr, 
	return rc;

	return rc;

}

}





static ssize_t lcd_store_power(struct device *dev,

static ssize_t lcd_power_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;
@@ -128,8 +128,9 @@ static ssize_t lcd_store_power(struct device *dev, 




	return rc;

	return rc;

}

}

static DEVICE_ATTR_RW(lcd_power);





static ssize_t lcd_show_contrast(struct device *dev,

static ssize_t contrast_show(struct device *dev,

		struct device_attribute *attr, char *buf)

		struct device_attribute *attr, char *buf)

{

{

	int rc = -ENXIO;

	int rc = -ENXIO;
@@ -143,7 +144,7 @@ static ssize_t lcd_show_contrast(struct device *dev, 
	return rc;

	return rc;

}

}





static ssize_t lcd_store_contrast(struct device *dev,

static ssize_t contrast_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;
@@ -166,14 +167,16 @@ static ssize_t lcd_store_contrast(struct device *dev, 




	return rc;

	return rc;

}

}

static DEVICE_ATTR_RW(contrast);





static ssize_t lcd_show_max_contrast(struct device *dev,

static ssize_t max_contrast_show(struct device *dev,

		struct device_attribute *attr, char *buf)

		struct device_attribute *attr, char *buf)

{

{

	struct lcd_device *ld = to_lcd_device(dev);

	struct lcd_device *ld = to_lcd_device(dev);





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

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

}

}

static DEVICE_ATTR_RO(max_contrast);





static struct class *lcd_class;

static struct class *lcd_class;
@@ -183,12 +186,13 @@ static void lcd_device_release(struct device *dev) 
	kfree(ld);

	kfree(ld);

}

}





static struct device_attribute lcd_device_attributes[] = {

static struct attribute *lcd_device_attrs[] = {

	__ATTR(lcd_power, 0644, lcd_show_power, lcd_store_power),

	&dev_attr_lcd_power.attr,

	__ATTR(contrast, 0644, lcd_show_contrast, lcd_store_contrast),

	&dev_attr_contrast.attr,

	__ATTR(max_contrast, 0444, lcd_show_max_contrast, NULL),

	&dev_attr_max_contrast.attr,

	__ATTR_NULL,

	NULL,

};

};

ATTRIBUTE_GROUPS(lcd_device);





/**

/**

 * lcd_device_register - register a new object of lcd_device class.

 * lcd_device_register - register a new object of lcd_device class.
@@ -344,7 +348,7 @@ static int __init lcd_class_init(void) 
		return PTR_ERR(lcd_class);

		return PTR_ERR(lcd_class);

	}

	}





	lcd_class->dev_attrs = lcd_device_attributes;

	lcd_class->dev_groups = lcd_device_groups;

	return 0;

	return 0;

}

}