diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:40:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:40:20 -0400 |
commit | dc690d8ef842b464f1c429a376ca16cb8dbee6ae (patch) | |
tree | 77955849af5a15755f5e55e24ae4b9c520583a72 /drivers/video | |
parent | 57399ec9077a4b962b81037aaa279fab52f5e989 (diff) | |
parent | 91a6902958f052358899f58683d44e36228d85c2 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (61 commits)
sysfs: add parameter "struct bin_attribute *" in .read/.write methods for sysfs binary attributes
sysfs: make directory dentries and inodes reclaimable
sysfs: implement sysfs_get_dentry()
sysfs: move sysfs_drop_dentry() to dir.c and make it static
sysfs: restructure add/remove paths and fix inode update
sysfs: use sysfs_mutex to protect the sysfs_dirent tree
sysfs: consolidate sysfs spinlocks
sysfs: make kobj point to sysfs_dirent instead of dentry
sysfs: implement sysfs_find_dirent() and sysfs_get_dirent()
sysfs: implement SYSFS_FLAG_REMOVED flag
sysfs: rename sysfs_dirent->s_type to s_flags and make room for flags
sysfs: make sysfs_drop_dentry() access inodes using ilookup()
sysfs: Fix oops in sysfs_drop_dentry on x86_64
sysfs: use singly-linked list for sysfs_dirent tree
sysfs: slim down sysfs_dirent->s_active
sysfs: move s_active functions to fs/sysfs/dir.c
sysfs: fix root sysfs_dirent -> root dentry association
sysfs: use iget_locked() instead of new_inode()
sysfs: reorganize sysfs_new_indoe() and sysfs_create()
sysfs: fix parent refcounting during rename and move
...
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/aty/radeon_base.c | 10 | ||||
-rw-r--r-- | drivers/video/backlight/backlight.c | 2 | ||||
-rw-r--r-- | drivers/video/backlight/lcd.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 2ce050193018..2349e71b0083 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -2102,7 +2102,9 @@ static ssize_t radeon_show_one_edid(char *buf, loff_t off, size_t count, const u | |||
2102 | } | 2102 | } |
2103 | 2103 | ||
2104 | 2104 | ||
2105 | static ssize_t radeon_show_edid1(struct kobject *kobj, char *buf, loff_t off, size_t count) | 2105 | static ssize_t radeon_show_edid1(struct kobject *kobj, |
2106 | struct bin_attribute *bin_attr, | ||
2107 | char *buf, loff_t off, size_t count) | ||
2106 | { | 2108 | { |
2107 | struct device *dev = container_of(kobj, struct device, kobj); | 2109 | struct device *dev = container_of(kobj, struct device, kobj); |
2108 | struct pci_dev *pdev = to_pci_dev(dev); | 2110 | struct pci_dev *pdev = to_pci_dev(dev); |
@@ -2113,7 +2115,9 @@ static ssize_t radeon_show_edid1(struct kobject *kobj, char *buf, loff_t off, si | |||
2113 | } | 2115 | } |
2114 | 2116 | ||
2115 | 2117 | ||
2116 | static ssize_t radeon_show_edid2(struct kobject *kobj, char *buf, loff_t off, size_t count) | 2118 | static ssize_t radeon_show_edid2(struct kobject *kobj, |
2119 | struct bin_attribute *bin_attr, | ||
2120 | char *buf, loff_t off, size_t count) | ||
2117 | { | 2121 | { |
2118 | struct device *dev = container_of(kobj, struct device, kobj); | 2122 | struct device *dev = container_of(kobj, struct device, kobj); |
2119 | struct pci_dev *pdev = to_pci_dev(dev); | 2123 | struct pci_dev *pdev = to_pci_dev(dev); |
@@ -2126,7 +2130,6 @@ static ssize_t radeon_show_edid2(struct kobject *kobj, char *buf, loff_t off, si | |||
2126 | static struct bin_attribute edid1_attr = { | 2130 | static struct bin_attribute edid1_attr = { |
2127 | .attr = { | 2131 | .attr = { |
2128 | .name = "edid1", | 2132 | .name = "edid1", |
2129 | .owner = THIS_MODULE, | ||
2130 | .mode = 0444, | 2133 | .mode = 0444, |
2131 | }, | 2134 | }, |
2132 | .size = EDID_LENGTH, | 2135 | .size = EDID_LENGTH, |
@@ -2136,7 +2139,6 @@ static struct bin_attribute edid1_attr = { | |||
2136 | static struct bin_attribute edid2_attr = { | 2139 | static struct bin_attribute edid2_attr = { |
2137 | .attr = { | 2140 | .attr = { |
2138 | .name = "edid2", | 2141 | .name = "edid2", |
2139 | .owner = THIS_MODULE, | ||
2140 | .mode = 0444, | 2142 | .mode = 0444, |
2141 | }, | 2143 | }, |
2142 | .size = EDID_LENGTH, | 2144 | .size = EDID_LENGTH, |
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c index c65e81ff3578..7e06223bca94 100644 --- a/drivers/video/backlight/backlight.c +++ b/drivers/video/backlight/backlight.c | |||
@@ -172,7 +172,7 @@ static struct class backlight_class = { | |||
172 | 172 | ||
173 | #define DECLARE_ATTR(_name,_mode,_show,_store) \ | 173 | #define DECLARE_ATTR(_name,_mode,_show,_store) \ |
174 | { \ | 174 | { \ |
175 | .attr = { .name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE }, \ | 175 | .attr = { .name = __stringify(_name), .mode = _mode }, \ |
176 | .show = _show, \ | 176 | .show = _show, \ |
177 | .store = _store, \ | 177 | .store = _store, \ |
178 | } | 178 | } |
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c index 6ef8f0a7a137..648b53c1fdea 100644 --- a/drivers/video/backlight/lcd.c +++ b/drivers/video/backlight/lcd.c | |||
@@ -157,7 +157,7 @@ static struct class lcd_class = { | |||
157 | 157 | ||
158 | #define DECLARE_ATTR(_name,_mode,_show,_store) \ | 158 | #define DECLARE_ATTR(_name,_mode,_show,_store) \ |
159 | { \ | 159 | { \ |
160 | .attr = { .name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE }, \ | 160 | .attr = { .name = __stringify(_name), .mode = _mode }, \ |
161 | .show = _show, \ | 161 | .show = _show, \ |
162 | .store = _store, \ | 162 | .store = _store, \ |
163 | } | 163 | } |