mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Driver core patches for 3.12-rc1
Here's the big driver core pull request for 3.12-rc1. Lots of tiny changes here fixing up the way sysfs attributes are created, to try to make drivers simpler, and fix a whole class race conditions with creations of device attributes after the device was announced to userspace. All the various pieces are acked by the different subsystem maintainers. Signed-off-by: Greg Kroah-Hartman <[email protected]> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (GNU/Linux) iEYEABECAAYFAlIlIPcACgkQMUfUDdst+ynUMwCaAnITsxyDXYQ4DqEsz8EcOtMk 718AoLrgnUZs3B+70AT34DVktg4HSThk =USl9 -----END PGP SIGNATURE----- Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core patches from Greg KH: "Here's the big driver core pull request for 3.12-rc1. Lots of tiny changes here fixing up the way sysfs attributes are created, to try to make drivers simpler, and fix a whole class race conditions with creations of device attributes after the device was announced to userspace. All the various pieces are acked by the different subsystem maintainers" * tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (119 commits) firmware loader: fix pending_fw_head list corruption drivers/base/memory.c: introduce help macro to_memory_block dynamic debug: line queries failing due to uninitialized local variable sysfs: sysfs_create_groups returns a value. debugfs: provide debugfs_create_x64() when disabled rbd: convert bus code to use bus_groups firmware: dcdbas: use binary attribute groups sysfs: add sysfs_create/remove_groups for when SYSFS is not enabled driver core: add #include <linux/sysfs.h> to core files. HID: convert bus code to use dev_groups Input: serio: convert bus code to use drv_groups Input: gameport: convert bus code to use drv_groups driver core: firmware: use __ATTR_RW() driver core: core: use DEVICE_ATTR_RO driver core: bus: use DRIVER_ATTR_WO() driver core: create write-only attribute macros for devices and drivers sysfs: create __ATTR_WO() driver-core: platform: convert bus code to use dev_groups workqueue: convert bus code to use dev_groups MEI: convert bus code to use dev_groups ...
This commit is contained in:
commit
542a086ac7
99 changed files with 1958 additions and 1915 deletions
|
|
@ -38,24 +38,25 @@
|
|||
* sysfs stuff
|
||||
*/
|
||||
|
||||
static ssize_t show_index(struct device *cd,
|
||||
struct device_attribute *attr, char *buf)
|
||||
static ssize_t index_show(struct device *cd,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct video_device *vdev = to_video_device(cd);
|
||||
|
||||
return sprintf(buf, "%i\n", vdev->index);
|
||||
}
|
||||
static DEVICE_ATTR_RO(index);
|
||||
|
||||
static ssize_t show_debug(struct device *cd,
|
||||
struct device_attribute *attr, char *buf)
|
||||
static ssize_t debug_show(struct device *cd,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct video_device *vdev = to_video_device(cd);
|
||||
|
||||
return sprintf(buf, "%i\n", vdev->debug);
|
||||
}
|
||||
|
||||
static ssize_t set_debug(struct device *cd, struct device_attribute *attr,
|
||||
const char *buf, size_t len)
|
||||
static ssize_t debug_store(struct device *cd, struct device_attribute *attr,
|
||||
const char *buf, size_t len)
|
||||
{
|
||||
struct video_device *vdev = to_video_device(cd);
|
||||
int res = 0;
|
||||
|
|
@ -68,21 +69,24 @@ static ssize_t set_debug(struct device *cd, struct device_attribute *attr,
|
|||
vdev->debug = value;
|
||||
return len;
|
||||
}
|
||||
static DEVICE_ATTR_RW(debug);
|
||||
|
||||
static ssize_t show_name(struct device *cd,
|
||||
static ssize_t name_show(struct device *cd,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct video_device *vdev = to_video_device(cd);
|
||||
|
||||
return sprintf(buf, "%.*s\n", (int)sizeof(vdev->name), vdev->name);
|
||||
}
|
||||
static DEVICE_ATTR_RO(name);
|
||||
|
||||
static struct device_attribute video_device_attrs[] = {
|
||||
__ATTR(name, S_IRUGO, show_name, NULL),
|
||||
__ATTR(debug, 0644, show_debug, set_debug),
|
||||
__ATTR(index, S_IRUGO, show_index, NULL),
|
||||
__ATTR_NULL
|
||||
static struct attribute *video_device_attrs[] = {
|
||||
&dev_attr_name.attr,
|
||||
&dev_attr_debug.attr,
|
||||
&dev_attr_index.attr,
|
||||
NULL,
|
||||
};
|
||||
ATTRIBUTE_GROUPS(video_device);
|
||||
|
||||
/*
|
||||
* Active devices
|
||||
|
|
@ -217,7 +221,7 @@ static void v4l2_device_release(struct device *cd)
|
|||
|
||||
static struct class video_class = {
|
||||
.name = VIDEO_NAME,
|
||||
.dev_attrs = video_device_attrs,
|
||||
.dev_groups = video_device_groups,
|
||||
};
|
||||
|
||||
struct video_device *video_devdata(struct file *file)
|
||||
|
|
|
|||
Loading…
Reference in a new issue