lkml.org 
[lkml]   [2008]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] cpuidle: make sysfs attributes sysdev class attributes
    These attributes are really sysdev class attributes.  The incorrect
    definition leads to an oops because of recent changes which make sysdev
    attributes use a different prototype.

    Reported-by: Eric Sesterhenn <snakebyte@gmx.de>
    Signed-off-by: Rabin Vincent <rabin@rab.in>
    ---
    Based on Andi's f718cd4add5aea9d379faff92f162571e356cc5f ("sched: make
    scheduler sysfs attributes sysdev class devices")

    drivers/cpuidle/sysfs.c | 29 +++++++++++++++--------------
    1 files changed, 15 insertions(+), 14 deletions(-)

    diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
    index 31a0e0b..97b0038 100644
    --- a/drivers/cpuidle/sysfs.c
    +++ b/drivers/cpuidle/sysfs.c
    @@ -21,8 +21,8 @@ static int __init cpuidle_sysfs_setup(char *unused)
    }
    __setup("cpuidle_sysfs_switch", cpuidle_sysfs_setup);

    -static ssize_t show_available_governors(struct sys_device *dev,
    - struct sysdev_attribute *attr, char *buf)
    +static ssize_t show_available_governors(struct sysdev_class *class,
    + char *buf)
    {
    ssize_t i = 0;
    struct cpuidle_governor *tmp;
    @@ -40,8 +40,8 @@ out:
    return i;
    }

    -static ssize_t show_current_driver(struct sys_device *dev,
    - struct sysdev_attribute *attr, char *buf)
    +static ssize_t show_current_driver(struct sysdev_class *class,
    + char *buf)
    {
    ssize_t ret;

    @@ -55,8 +55,8 @@ static ssize_t show_current_driver(struct sys_device *dev,
    return ret;
    }

    -static ssize_t show_current_governor(struct sys_device *dev,
    - struct sysdev_attribute *attr, char *buf)
    +static ssize_t show_current_governor(struct sysdev_class *class,
    + char *buf)
    {
    ssize_t ret;

    @@ -70,9 +70,8 @@ static ssize_t show_current_governor(struct sys_device *dev,
    return ret;
    }

    -static ssize_t store_current_governor(struct sys_device *dev,
    - struct sysdev_attribute *attr,
    - const char *buf, size_t count)
    +static ssize_t store_current_governor(struct sysdev_class *class,
    + const char *buf, size_t count)
    {
    char gov_name[CPUIDLE_NAME_LEN];
    int ret = -EINVAL;
    @@ -104,8 +103,9 @@ static ssize_t store_current_governor(struct sys_device *dev,
    return count;
    }

    -static SYSDEV_ATTR(current_driver, 0444, show_current_driver, NULL);
    -static SYSDEV_ATTR(current_governor_ro, 0444, show_current_governor, NULL);
    +static SYSDEV_CLASS_ATTR(current_driver, 0444, show_current_driver, NULL);
    +static SYSDEV_CLASS_ATTR(current_governor_ro, 0444, show_current_governor,
    + NULL);

    static struct attribute *cpuclass_default_attrs[] = {
    &attr_current_driver.attr,
    @@ -113,9 +113,10 @@ static struct attribute *cpuclass_default_attrs[] = {
    NULL
    };

    -static SYSDEV_ATTR(available_governors, 0444, show_available_governors, NULL);
    -static SYSDEV_ATTR(current_governor, 0644, show_current_governor,
    - store_current_governor);
    +static SYSDEV_CLASS_ATTR(available_governors, 0444, show_available_governors,
    + NULL);
    +static SYSDEV_CLASS_ATTR(current_governor, 0644, show_current_governor,
    + store_current_governor);

    static struct attribute *cpuclass_switch_attrs[] = {
    &attr_available_governors.attr,
    --
    1.5.6.3

    \
     
     \ /
      Last update: 2008-08-05 20:07    [W:0.046 / U:30.908 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site