mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -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
|
|
@ -25,15 +25,14 @@
|
|||
*/
|
||||
|
||||
static ssize_t
|
||||
rtc_sysfs_show_name(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
name_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
return sprintf(buf, "%s\n", to_rtc_device(dev)->name);
|
||||
}
|
||||
static DEVICE_ATTR_RO(name);
|
||||
|
||||
static ssize_t
|
||||
rtc_sysfs_show_date(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
date_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
ssize_t retval;
|
||||
struct rtc_time tm;
|
||||
|
|
@ -46,10 +45,10 @@ rtc_sysfs_show_date(struct device *dev, struct device_attribute *attr,
|
|||
|
||||
return retval;
|
||||
}
|
||||
static DEVICE_ATTR_RO(date);
|
||||
|
||||
static ssize_t
|
||||
rtc_sysfs_show_time(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
time_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
ssize_t retval;
|
||||
struct rtc_time tm;
|
||||
|
|
@ -62,10 +61,10 @@ rtc_sysfs_show_time(struct device *dev, struct device_attribute *attr,
|
|||
|
||||
return retval;
|
||||
}
|
||||
static DEVICE_ATTR_RO(time);
|
||||
|
||||
static ssize_t
|
||||
rtc_sysfs_show_since_epoch(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
since_epoch_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
ssize_t retval;
|
||||
struct rtc_time tm;
|
||||
|
|
@ -79,16 +78,16 @@ rtc_sysfs_show_since_epoch(struct device *dev, struct device_attribute *attr,
|
|||
|
||||
return retval;
|
||||
}
|
||||
static DEVICE_ATTR_RO(since_epoch);
|
||||
|
||||
static ssize_t
|
||||
rtc_sysfs_show_max_user_freq(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
max_user_freq_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
return sprintf(buf, "%d\n", to_rtc_device(dev)->max_user_freq);
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
rtc_sysfs_set_max_user_freq(struct device *dev, struct device_attribute *attr,
|
||||
max_user_freq_store(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t n)
|
||||
{
|
||||
struct rtc_device *rtc = to_rtc_device(dev);
|
||||
|
|
@ -101,6 +100,7 @@ rtc_sysfs_set_max_user_freq(struct device *dev, struct device_attribute *attr,
|
|||
|
||||
return n;
|
||||
}
|
||||
static DEVICE_ATTR_RW(max_user_freq);
|
||||
|
||||
/**
|
||||
* rtc_sysfs_show_hctosys - indicate if the given RTC set the system time
|
||||
|
|
@ -109,8 +109,7 @@ rtc_sysfs_set_max_user_freq(struct device *dev, struct device_attribute *attr,
|
|||
* boot or resume event.
|
||||
*/
|
||||
static ssize_t
|
||||
rtc_sysfs_show_hctosys(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
hctosys_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
#ifdef CONFIG_RTC_HCTOSYS_DEVICE
|
||||
if (rtc_hctosys_ret == 0 &&
|
||||
|
|
@ -121,17 +120,18 @@ rtc_sysfs_show_hctosys(struct device *dev, struct device_attribute *attr,
|
|||
#endif
|
||||
return sprintf(buf, "0\n");
|
||||
}
|
||||
static DEVICE_ATTR_RO(hctosys);
|
||||
|
||||
static struct device_attribute rtc_attrs[] = {
|
||||
__ATTR(name, S_IRUGO, rtc_sysfs_show_name, NULL),
|
||||
__ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL),
|
||||
__ATTR(time, S_IRUGO, rtc_sysfs_show_time, NULL),
|
||||
__ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL),
|
||||
__ATTR(max_user_freq, S_IRUGO | S_IWUSR, rtc_sysfs_show_max_user_freq,
|
||||
rtc_sysfs_set_max_user_freq),
|
||||
__ATTR(hctosys, S_IRUGO, rtc_sysfs_show_hctosys, NULL),
|
||||
{ },
|
||||
static struct attribute *rtc_attrs[] = {
|
||||
&dev_attr_name.attr,
|
||||
&dev_attr_date.attr,
|
||||
&dev_attr_time.attr,
|
||||
&dev_attr_since_epoch.attr,
|
||||
&dev_attr_max_user_freq.attr,
|
||||
&dev_attr_hctosys.attr,
|
||||
NULL,
|
||||
};
|
||||
ATTRIBUTE_GROUPS(rtc);
|
||||
|
||||
static ssize_t
|
||||
rtc_sysfs_show_wakealarm(struct device *dev, struct device_attribute *attr,
|
||||
|
|
@ -261,5 +261,5 @@ void rtc_sysfs_del_device(struct rtc_device *rtc)
|
|||
|
||||
void __init rtc_sysfs_init(struct class *rtc_class)
|
||||
{
|
||||
rtc_class->dev_attrs = rtc_attrs;
|
||||
rtc_class->dev_groups = rtc_groups;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue