diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-09-24 17:00:14 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-12-30 16:14:15 +0200 |
| commit | 303e4697e762dc92a40405f4e4b8aac02cd0d70b (patch) | |
| tree | 3b44dbbc9cb018010894cbf4eda20ca837e8d431 /drivers/video/omap2 | |
| parent | 29fceeebb6ad55dd0e27f6f7b8f10aa039315cde (diff) | |
| download | op-kernel-dev-303e4697e762dc92a40405f4e4b8aac02cd0d70b.zip op-kernel-dev-303e4697e762dc92a40405f4e4b8aac02cd0d70b.tar.gz | |
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: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
| -rw-r--r-- | drivers/video/omap2/dss/display-sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/display-sysfs.c b/drivers/video/omap2/dss/display-sysfs.c index 21d7f77..f7b5f95 100644 --- a/drivers/video/omap2/dss/display-sysfs.c +++ b/drivers/video/omap2/dss/display-sysfs.c @@ -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, |
