Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de505e70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging 

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (s3c) Initialize sysfs attributes
  hwmon: (ibmpex) Initialize sysfs attributes
  hwmon: (ibmaem) Initialize sysfs attributes
  hwmon: (asus_atk0110) Consolidate sysfs attribute initialization
  hwmon: (coretemp) Drop unused struct members
parents c11760c6 b1e698db

drivers/hwmon/asus_atk0110.c

+1 −4
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ static struct device_attribute atk_name_attr = 
static void atk_init_attribute(struct device_attribute *attr, char *name,

		sysfs_show_func show)

{

	sysfs_attr_init(&attr->attr);

	attr->attr.name = name;

	attr->attr.mode = 0444;

	attr->show = show;
@@ -1188,19 +1189,15 @@ static int atk_create_files(struct atk_data *data) 
	int err;



	list_for_each_entry(s, &data->sensor_list, list) {

		sysfs_attr_init(&s->input_attr.attr);

		err = device_create_file(data->hwmon_dev, &s->input_attr);

		if (err)

			return err;

		sysfs_attr_init(&s->label_attr.attr);

		err = device_create_file(data->hwmon_dev, &s->label_attr);

		if (err)

			return err;

		sysfs_attr_init(&s->limit1_attr.attr);

		err = device_create_file(data->hwmon_dev, &s->limit1_attr);

		if (err)

			return err;

		sysfs_attr_init(&s->limit2_attr.attr);

		err = device_create_file(data->hwmon_dev, &s->limit2_attr);

		if (err)

			return err;

drivers/hwmon/coretemp.c

+0 −4
Original line number Diff line number Diff line
@@ -97,9 +97,7 @@ struct platform_data { 
struct pdev_entry {

	struct list_head list;

	struct platform_device *pdev;

	unsigned int cpu;

	u16 phys_proc_id;

	u16 cpu_core_id;

};



static LIST_HEAD(pdev_list);
@@ -653,9 +651,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) 
	}



	pdev_entry->pdev = pdev;

	pdev_entry->cpu = cpu;

	pdev_entry->phys_proc_id = TO_PHYS_ID(cpu);

	pdev_entry->cpu_core_id = TO_CORE_ID(cpu);



	list_add_tail(&pdev_entry->list, &pdev_list);

	mutex_unlock(&pdev_list_mutex);

drivers/hwmon/ibmaem.c

+2 −0
Original line number Diff line number Diff line
@@ -947,6 +947,7 @@ static int aem_register_sensors(struct aem_data *data, 


	/* Set up read-only sensors */

	while (ro->label) {

		sysfs_attr_init(&sensors->dev_attr.attr);

		sensors->dev_attr.attr.name = ro->label;

		sensors->dev_attr.attr.mode = S_IRUGO;

		sensors->dev_attr.show = ro->show;
@@ -963,6 +964,7 @@ static int aem_register_sensors(struct aem_data *data, 


	/* Set up read-write sensors */

	while (rw->label) {

		sysfs_attr_init(&sensors->dev_attr.attr);

		sensors->dev_attr.attr.name = rw->label;

		sensors->dev_attr.attr.mode = S_IRUGO | S_IWUSR;

		sensors->dev_attr.show = rw->show;

drivers/hwmon/ibmpex.c

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ static int create_sensor(struct ibmpex_bmc_data *data, int type, 
	else if (type == POWER_SENSOR)

		sprintf(n, power_sensor_name_templates[func], "power", counter);



	sysfs_attr_init(&data->sensors[sensor].attr[func].dev_attr.attr);

	data->sensors[sensor].attr[func].dev_attr.attr.name = n;

	data->sensors[sensor].attr[func].dev_attr.attr.mode = S_IRUGO;

	data->sensors[sensor].attr[func].dev_attr.show = ibmpex_show_sensor;

drivers/hwmon/s3c-hwmon.c

+2 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static int s3c_hwmon_create_attr(struct device *dev, 


	attr = &attrs->in;

	attr->index = channel;

	sysfs_attr_init(&attr->dev_attr.attr);

	attr->dev_attr.attr.name  = attrs->in_name;

	attr->dev_attr.attr.mode  = S_IRUGO;

	attr->dev_attr.show = s3c_hwmon_ch_show;
@@ -249,6 +250,7 @@ static int s3c_hwmon_create_attr(struct device *dev, 


		attr = &attrs->label;

		attr->index = channel;

		sysfs_attr_init(&attr->dev_attr.attr);

		attr->dev_attr.attr.name  = attrs->label_name;

		attr->dev_attr.attr.mode  = S_IRUGO;

		attr->dev_attr.show = s3c_hwmon_label_show;