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

Commit 303e4697 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: rename display-sysfs 'name' entry 



omapdss in compat mode creates some sysfs files into the device's sysfs
directory, including a 'name' file. This works fine for
platform_devices, but breaks with i2c or spi devices, as those already
have a 'name' file.

Fix this by renaming the omapdss's 'name' file to 'display_name'.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 29fceeeb

drivers/video/omap2/dss/display-sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static ssize_t display_wss_store(struct device *dev, 
	return size;

}



static DEVICE_ATTR(name, S_IRUGO, display_name_show, NULL);

static DEVICE_ATTR(display_name, S_IRUGO, display_name_show, NULL);

static DEVICE_ATTR(enabled, S_IRUGO|S_IWUSR,

		display_enabled_show, display_enabled_store);

static DEVICE_ATTR(tear_elim, S_IRUGO|S_IWUSR,
@@ -292,7 +292,7 @@ static DEVICE_ATTR(wss, S_IRUGO|S_IWUSR, 
		display_wss_show, display_wss_store);



static const struct attribute *display_sysfs_attrs[] = {

	&dev_attr_name.attr,

	&dev_attr_display_name.attr,

	&dev_attr_enabled.attr,

	&dev_attr_tear_elim.attr,

	&dev_attr_timings.attr,