Skip to content

Commit

Permalink
clocksource: Use DEVICE_ATTR_RW/RO/WO to define device attributes
Browse files Browse the repository at this point in the history
Convert DEVICE_ATTR to DEVICE_ATTR_RW/RO/WO which is the preferred and
simpler way of implementation.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: arnd@arndb.de
Cc: sboyd@codeaurora.org
Cc: broonie@kernel.org
Cc: john.stultz@linaro.org
Link: https://lkml.kernel.org/r/8f35c77e753e957b61187e8e7b2e4a3d61e4a72b.1516167691.git.baolin.wang@linaro.org
  • Loading branch information
wangbaolin719 authored and KAGA-KOKO committed Feb 28, 2018
1 parent 7f852af commit e87821d
Showing 1 changed file with 17 additions and 26 deletions.
43 changes: 17 additions & 26 deletions kernel/time/clocksource.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand All @@ -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;

Expand All @@ -920,17 +920,18 @@ 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
* @count: length of buffer
*
* 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)
{
Expand All @@ -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;
Expand All @@ -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",
Expand Down

0 comments on commit e87821d

Please sign in to comment.