|
@@ -673,7 +673,7 @@ static void w83627ehf_write_fan_div(struct w83627ehf_data *data, int nr)
|
|
|
static void w83627ehf_write_fan_div_common(struct device *dev,
|
|
|
struct w83627ehf_data *data, int nr)
|
|
|
{
|
|
|
- struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
|
|
+ struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
|
|
|
|
|
if (sio_data->kind == nct6776)
|
|
|
; /* no dividers, do nothing */
|
|
@@ -724,7 +724,7 @@ static void w83627ehf_update_fan_div(struct w83627ehf_data *data)
|
|
|
static void w83627ehf_update_fan_div_common(struct device *dev,
|
|
|
struct w83627ehf_data *data)
|
|
|
{
|
|
|
- struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
|
|
+ struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
|
|
|
|
|
if (sio_data->kind == nct6776)
|
|
|
; /* no dividers, do nothing */
|
|
@@ -781,7 +781,7 @@ static void w83627ehf_update_pwm(struct w83627ehf_data *data)
|
|
|
static void w83627ehf_update_pwm_common(struct device *dev,
|
|
|
struct w83627ehf_data *data)
|
|
|
{
|
|
|
- struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
|
|
+ struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
|
|
|
|
|
if (sio_data->kind == nct6775 || sio_data->kind == nct6776)
|
|
|
nct6775_update_pwm(data);
|
|
@@ -792,7 +792,7 @@ static void w83627ehf_update_pwm_common(struct device *dev,
|
|
|
static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
|
|
|
{
|
|
|
struct w83627ehf_data *data = dev_get_drvdata(dev);
|
|
|
- struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
|
|
+ struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
|
|
|
|
|
int i;
|
|
|
|
|
@@ -1392,7 +1392,7 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
|
|
|
{
|
|
|
struct w83627ehf_data *data = dev_get_drvdata(dev);
|
|
|
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
|
|
|
- struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
|
|
+ struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
|
|
int nr = sensor_attr->index;
|
|
|
unsigned long val;
|
|
|
int err;
|
|
@@ -1448,7 +1448,7 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,
|
|
|
const char *buf, size_t count)
|
|
|
{
|
|
|
struct w83627ehf_data *data = dev_get_drvdata(dev);
|
|
|
- struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
|
|
+ struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
|
|
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
|
|
|
int nr = sensor_attr->index;
|
|
|
unsigned long val;
|
|
@@ -1527,7 +1527,7 @@ store_tolerance(struct device *dev, struct device_attribute *attr,
|
|
|
const char *buf, size_t count)
|
|
|
{
|
|
|
struct w83627ehf_data *data = dev_get_drvdata(dev);
|
|
|
- struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
|
|
+ struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
|
|
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
|
|
|
int nr = sensor_attr->index;
|
|
|
u16 reg;
|
|
@@ -2065,7 +2065,7 @@ w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data,
|
|
|
static int w83627ehf_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct device *dev = &pdev->dev;
|
|
|
- struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
|
|
+ struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
|
|
struct w83627ehf_data *data;
|
|
|
struct resource *res;
|
|
|
u8 en_vrm10;
|
|
@@ -2618,7 +2618,7 @@ static int w83627ehf_remove(struct platform_device *pdev)
|
|
|
static int w83627ehf_suspend(struct device *dev)
|
|
|
{
|
|
|
struct w83627ehf_data *data = w83627ehf_update_device(dev);
|
|
|
- struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
|
|
+ struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
|
|
|
|
|
mutex_lock(&data->update_lock);
|
|
|
data->vbat = w83627ehf_read_value(data, W83627EHF_REG_VBAT);
|
|
@@ -2634,7 +2634,7 @@ static int w83627ehf_suspend(struct device *dev)
|
|
|
static int w83627ehf_resume(struct device *dev)
|
|
|
{
|
|
|
struct w83627ehf_data *data = dev_get_drvdata(dev);
|
|
|
- struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
|
|
+ struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
|
|
int i;
|
|
|
|
|
|
mutex_lock(&data->update_lock);
|