lkml.org 
[lkml]   [2019]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] power: sysfs: Remove wakeup_abort_count attribute.
    Date
    wakeup_abort_count and wakeup_count sysfs entries print the
    same (wakeup_count) attribute. This patch removes the duplicate
    wakeup_abort_count sysfs entry.

    Signed-off-by: Ravi Chandra Sadineni <ravisadineni@chromium.org>
    ---
    Documentation/ABI/testing/sysfs-devices-power | 25 ++++++-------------
    drivers/base/power/sysfs.c | 19 --------------
    2 files changed, 7 insertions(+), 37 deletions(-)

    diff --git a/Documentation/ABI/testing/sysfs-devices-power b/Documentation/ABI/testing/sysfs-devices-power
    index 80a00f7b6667..1ca04b4f0489 100644
    --- a/Documentation/ABI/testing/sysfs-devices-power
    +++ b/Documentation/ABI/testing/sysfs-devices-power
    @@ -81,12 +81,13 @@ What: /sys/devices/.../power/wakeup_count
    Date: September 2010
    Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
    Description:
    - The /sys/devices/.../wakeup_count attribute contains the number
    - of signaled wakeup events associated with the device. This
    - attribute is read-only. If the device is not capable to wake up
    - the system from sleep states, this attribute is not present.
    - If the device is not enabled to wake up the system from sleep
    - states, this attribute is empty.
    + The /sys/devices/.../wakeup_count attribute contains the
    + number of times the processing of a wakeup event associated with
    + the device might have aborted system transition into a sleep
    + state in progress. This attribute is read-only. If the device
    + is not capable to wake up the system from sleep states, this
    + attribute is not present. If the device is not enabled to wake
    + up the system from sleep states, this attribute is empty.

    What: /sys/devices/.../power/wakeup_active_count
    Date: September 2010
    @@ -100,18 +101,6 @@ Description:
    the device is not enabled to wake up the system from sleep
    states, this attribute is empty.

    -What: /sys/devices/.../power/wakeup_abort_count
    -Date: February 2012
    -Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
    -Description:
    - The /sys/devices/.../wakeup_abort_count attribute contains the
    - number of times the processing of a wakeup event associated with
    - the device might have aborted system transition into a sleep
    - state in progress. This attribute is read-only. If the device
    - is not capable to wake up the system from sleep states, this
    - attribute is not present. If the device is not enabled to wake
    - up the system from sleep states, this attribute is empty.
    -
    What: /sys/devices/.../power/wakeup_expire_count
    Date: February 2012
    Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
    diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
    index 1b9c281cbe41..f42044d9711c 100644
    --- a/drivers/base/power/sysfs.c
    +++ b/drivers/base/power/sysfs.c
    @@ -375,24 +375,6 @@ static ssize_t wakeup_active_count_show(struct device *dev,

    static DEVICE_ATTR_RO(wakeup_active_count);

    -static ssize_t wakeup_abort_count_show(struct device *dev,
    - struct device_attribute *attr,
    - char *buf)
    -{
    - unsigned long count = 0;
    - bool enabled = false;
    -
    - spin_lock_irq(&dev->power.lock);
    - if (dev->power.wakeup) {
    - count = dev->power.wakeup->wakeup_count;
    - enabled = true;
    - }
    - spin_unlock_irq(&dev->power.lock);
    - return enabled ? sprintf(buf, "%lu\n", count) : sprintf(buf, "\n");
    -}
    -
    -static DEVICE_ATTR_RO(wakeup_abort_count);
    -
    static ssize_t wakeup_expire_count_show(struct device *dev,
    struct device_attribute *attr,
    char *buf)
    @@ -580,7 +562,6 @@ static struct attribute *wakeup_attrs[] = {
    &dev_attr_wakeup.attr,
    &dev_attr_wakeup_count.attr,
    &dev_attr_wakeup_active_count.attr,
    - &dev_attr_wakeup_abort_count.attr,
    &dev_attr_wakeup_expire_count.attr,
    &dev_attr_wakeup_active.attr,
    &dev_attr_wakeup_total_time_ms.attr,
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-22 19:04    [W:3.102 / U:0.836 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site