Commit d013f7f5 authored by Julia Lawall's avatar Julia Lawall Committed by Guenter Roeck

hwmon: (fam15h_power) use permission-specific DEVICE_ATTR variants

Use DEVICE_ATTR_RO for read only attributes and DEVICE_ATTR_RW for
read/write attributes. This simplifies the source code, improves
readbility, and reduces the chance of inconsistencies.

The conversion was done automatically using coccinelle. It was validated
by compiling both the old and the new source code and comparing its text,
data, and bss size.
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
[groeck: Updated description]
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 1d05303c
...@@ -83,7 +83,7 @@ static bool is_carrizo_or_later(void) ...@@ -83,7 +83,7 @@ static bool is_carrizo_or_later(void)
return boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60; return boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60;
} }
static ssize_t show_power(struct device *dev, static ssize_t power1_input_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
u32 val, tdp_limit, running_avg_range; u32 val, tdp_limit, running_avg_range;
...@@ -136,16 +136,16 @@ static ssize_t show_power(struct device *dev, ...@@ -136,16 +136,16 @@ static ssize_t show_power(struct device *dev,
curr_pwr_watts = (curr_pwr_watts * 15625) >> (10 + running_avg_range); curr_pwr_watts = (curr_pwr_watts * 15625) >> (10 + running_avg_range);
return sprintf(buf, "%u\n", (unsigned int) curr_pwr_watts); return sprintf(buf, "%u\n", (unsigned int) curr_pwr_watts);
} }
static DEVICE_ATTR(power1_input, S_IRUGO, show_power, NULL); static DEVICE_ATTR_RO(power1_input);
static ssize_t show_power_crit(struct device *dev, static ssize_t power1_crit_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct fam15h_power_data *data = dev_get_drvdata(dev); struct fam15h_power_data *data = dev_get_drvdata(dev);
return sprintf(buf, "%u\n", data->processor_pwr_watts); return sprintf(buf, "%u\n", data->processor_pwr_watts);
} }
static DEVICE_ATTR(power1_crit, S_IRUGO, show_power_crit, NULL); static DEVICE_ATTR_RO(power1_crit);
static void do_read_registers_on_cu(void *_data) static void do_read_registers_on_cu(void *_data)
{ {
...@@ -212,9 +212,8 @@ static int read_registers(struct fam15h_power_data *data) ...@@ -212,9 +212,8 @@ static int read_registers(struct fam15h_power_data *data)
return 0; return 0;
} }
static ssize_t acc_show_power(struct device *dev, static ssize_t power1_average_show(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr, char *buf)
char *buf)
{ {
struct fam15h_power_data *data = dev_get_drvdata(dev); struct fam15h_power_data *data = dev_get_drvdata(dev);
u64 prev_cu_acc_power[MAX_CUS], prev_ptsc[MAX_CUS], u64 prev_cu_acc_power[MAX_CUS], prev_ptsc[MAX_CUS],
...@@ -267,9 +266,9 @@ static ssize_t acc_show_power(struct device *dev, ...@@ -267,9 +266,9 @@ static ssize_t acc_show_power(struct device *dev,
return sprintf(buf, "%llu\n", (unsigned long long)avg_acc); return sprintf(buf, "%llu\n", (unsigned long long)avg_acc);
} }
static DEVICE_ATTR(power1_average, S_IRUGO, acc_show_power, NULL); static DEVICE_ATTR_RO(power1_average);
static ssize_t acc_show_power_period(struct device *dev, static ssize_t power1_average_interval_show(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
...@@ -278,7 +277,7 @@ static ssize_t acc_show_power_period(struct device *dev, ...@@ -278,7 +277,7 @@ static ssize_t acc_show_power_period(struct device *dev,
return sprintf(buf, "%lu\n", data->power_period); return sprintf(buf, "%lu\n", data->power_period);
} }
static ssize_t acc_set_power_period(struct device *dev, static ssize_t power1_average_interval_store(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
...@@ -301,8 +300,7 @@ static ssize_t acc_set_power_period(struct device *dev, ...@@ -301,8 +300,7 @@ static ssize_t acc_set_power_period(struct device *dev,
return count; return count;
} }
static DEVICE_ATTR(power1_average_interval, S_IRUGO | S_IWUSR, static DEVICE_ATTR_RW(power1_average_interval);
acc_show_power_period, acc_set_power_period);
static int fam15h_power_init_attrs(struct pci_dev *pdev, static int fam15h_power_init_attrs(struct pci_dev *pdev,
struct fam15h_power_data *data) struct fam15h_power_data *data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment