lkml.org 
[lkml]   [2009]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 48/64] thermal: remove driver_data direct access of struct device
    Date
    In the near future, the driver core is going to not allow direct access
    to the driver_data pointer in struct device. Instead, the functions
    dev_get_drvdata() and dev_set_drvdata() should be used. These functions
    have been around since the beginning, so are backwards compatible with
    all older kernel versions.


    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/thermal/thermal_sys.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
    index 5e38ba1..0a69672 100644
    --- a/drivers/thermal/thermal_sys.c
    +++ b/drivers/thermal/thermal_sys.c
    @@ -417,7 +417,7 @@ static LIST_HEAD(thermal_hwmon_list);
    static ssize_t
    name_show(struct device *dev, struct device_attribute *attr, char *buf)
    {
    - struct thermal_hwmon_device *hwmon = dev->driver_data;
    + struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
    return sprintf(buf, "%s\n", hwmon->type);
    }
    static DEVICE_ATTR(name, 0444, name_show, NULL);
    @@ -488,7 +488,7 @@ thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
    result = PTR_ERR(hwmon->device);
    goto free_mem;
    }
    - hwmon->device->driver_data = hwmon;
    + dev_set_drvdata(hwmon->device, hwmon);
    result = device_create_file(hwmon->device, &dev_attr_name);
    if (result)
    goto unregister_hwmon_device;
    --
    1.6.3.2


    \
     
     \ /
      Last update: 2009-06-16 08:33    [W:3.426 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site