|
@@ -857,16 +857,16 @@ EXPORT_SYMBOL(clocksource_unregister);
|
|
|
|
|
|
#ifdef CONFIG_SYSFS
|
|
|
/**
|
|
|
- * sysfs_show_current_clocksources - sysfs interface for current clocksource
|
|
|
+ * current_clocksource_show - sysfs interface for current clocksource
|
|
|
* @dev: unused
|
|
|
* @attr: unused
|
|
|
* @buf: char buffer to be filled with clocksource list
|
|
|
*
|
|
|
* Provides sysfs interface for listing current clocksource.
|
|
|
*/
|
|
|
-static ssize_t
|
|
|
-sysfs_show_current_clocksources(struct device *dev,
|
|
|
- struct device_attribute *attr, char *buf)
|
|
|
+static ssize_t current_clocksource_show(struct device *dev,
|
|
|
+ struct device_attribute *attr,
|
|
|
+ char *buf)
|
|
|
{
|
|
|
ssize_t count = 0;
|
|
|
|
|
@@ -895,7 +895,7 @@ ssize_t sysfs_get_uname(const char *buf, char *dst, size_t cnt)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * sysfs_override_clocksource - interface for manually overriding clocksource
|
|
|
+ * current_clocksource_store - interface for manually overriding clocksource
|
|
|
* @dev: unused
|
|
|
* @attr: unused
|
|
|
* @buf: name of override clocksource
|
|
@@ -904,9 +904,9 @@ ssize_t sysfs_get_uname(const char *buf, char *dst, size_t cnt)
|
|
|
* Takes input from sysfs interface for manually overriding the default
|
|
|
* clocksource selection.
|
|
|
*/
|
|
|
-static ssize_t sysfs_override_clocksource(struct device *dev,
|
|
|
- struct device_attribute *attr,
|
|
|
- const char *buf, size_t count)
|
|
|
+static ssize_t current_clocksource_store(struct device *dev,
|
|
|
+ struct device_attribute *attr,
|
|
|
+ const char *buf, size_t count)
|
|
|
{
|
|
|
ssize_t ret;
|
|
|
|
|
@@ -920,9 +920,10 @@ static ssize_t sysfs_override_clocksource(struct device *dev,
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
|
+static DEVICE_ATTR_RW(current_clocksource);
|
|
|
|
|
|
/**
|
|
|
- * sysfs_unbind_current_clocksource - interface for manually unbinding clocksource
|
|
|
+ * unbind_clocksource_store - interface for manually unbinding clocksource
|
|
|
* @dev: unused
|
|
|
* @attr: unused
|
|
|
* @buf: unused
|
|
@@ -930,7 +931,7 @@ static ssize_t sysfs_override_clocksource(struct device *dev,
|
|
|
*
|
|
|
* Takes input from sysfs interface for manually unbinding a clocksource.
|
|
|
*/
|
|
|
-static ssize_t sysfs_unbind_clocksource(struct device *dev,
|
|
|
+static ssize_t unbind_clocksource_store(struct device *dev,
|
|
|
struct device_attribute *attr,
|
|
|
const char *buf, size_t count)
|
|
|
{
|
|
@@ -954,19 +955,19 @@ static ssize_t sysfs_unbind_clocksource(struct device *dev,
|
|
|
|
|
|
return ret ? ret : count;
|
|
|
}
|
|
|
+static DEVICE_ATTR_WO(unbind_clocksource);
|
|
|
|
|
|
/**
|
|
|
- * sysfs_show_available_clocksources - sysfs interface for listing clocksource
|
|
|
+ * available_clocksource_show - sysfs interface for listing clocksource
|
|
|
* @dev: unused
|
|
|
* @attr: unused
|
|
|
* @buf: char buffer to be filled with clocksource list
|
|
|
*
|
|
|
* Provides sysfs interface for listing registered clocksources
|
|
|
*/
|
|
|
-static ssize_t
|
|
|
-sysfs_show_available_clocksources(struct device *dev,
|
|
|
- struct device_attribute *attr,
|
|
|
- char *buf)
|
|
|
+static ssize_t available_clocksource_show(struct device *dev,
|
|
|
+ struct device_attribute *attr,
|
|
|
+ char *buf)
|
|
|
{
|
|
|
struct clocksource *src;
|
|
|
ssize_t count = 0;
|
|
@@ -990,17 +991,7 @@ sysfs_show_available_clocksources(struct device *dev,
|
|
|
|
|
|
return count;
|
|
|
}
|
|
|
-
|
|
|
-/*
|
|
|
- * Sysfs setup bits:
|
|
|
- */
|
|
|
-static DEVICE_ATTR(current_clocksource, 0644, sysfs_show_current_clocksources,
|
|
|
- sysfs_override_clocksource);
|
|
|
-
|
|
|
-static DEVICE_ATTR(unbind_clocksource, 0200, NULL, sysfs_unbind_clocksource);
|
|
|
-
|
|
|
-static DEVICE_ATTR(available_clocksource, 0444,
|
|
|
- sysfs_show_available_clocksources, NULL);
|
|
|
+static DEVICE_ATTR_RO(available_clocksource);
|
|
|
|
|
|
static struct bus_type clocksource_subsys = {
|
|
|
.name = "clocksource",
|