Commit 1263193d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.1-3' of... 

Merge tag 'platform-drivers-x86-v4.1-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fix from Darren Hart:
 "thinkpad_acpi: Revert unintentional device attribute renaming"

* tag 'platform-drivers-x86-v4.1-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  thinkpad_acpi: Revert unintentional device attribute renaming
parents de182468 5fb73bc2

drivers/platform/x86/thinkpad_acpi.c

+19 −18
Original line number Diff line number Diff line
@@ -2897,7 +2897,7 @@ static ssize_t hotkey_wakeup_reason_show(struct device *dev, 
	return snprintf(buf, PAGE_SIZE, "%d\n", hotkey_wakeup_reason);

}



static DEVICE_ATTR_RO(hotkey_wakeup_reason);

static DEVICE_ATTR(wakeup_reason, S_IRUGO, hotkey_wakeup_reason_show, NULL);



static void hotkey_wakeup_reason_notify_change(void)

{
@@ -2913,7 +2913,8 @@ static ssize_t hotkey_wakeup_hotunplug_complete_show(struct device *dev, 
	return snprintf(buf, PAGE_SIZE, "%d\n", hotkey_autosleep_ack);

}



static DEVICE_ATTR_RO(hotkey_wakeup_hotunplug_complete);

static DEVICE_ATTR(wakeup_hotunplug_complete, S_IRUGO,

		   hotkey_wakeup_hotunplug_complete_show, NULL);



static void hotkey_wakeup_hotunplug_complete_notify_change(void)

{
@@ -2978,8 +2979,8 @@ static struct attribute *hotkey_attributes[] __initdata = { 
	&dev_attr_hotkey_enable.attr,

	&dev_attr_hotkey_bios_enabled.attr,

	&dev_attr_hotkey_bios_mask.attr,

	&dev_attr_hotkey_wakeup_reason.attr,

	&dev_attr_hotkey_wakeup_hotunplug_complete.attr,

	&dev_attr_wakeup_reason.attr,

	&dev_attr_wakeup_hotunplug_complete.attr,

	&dev_attr_hotkey_mask.attr,

	&dev_attr_hotkey_all_mask.attr,

	&dev_attr_hotkey_recommended_mask.attr,
@@ -4393,12 +4394,13 @@ static ssize_t wan_enable_store(struct device *dev, 
			attr, buf, count);

}



static DEVICE_ATTR_RW(wan_enable);

static DEVICE_ATTR(wwan_enable, S_IWUSR | S_IRUGO,

		   wan_enable_show, wan_enable_store);



/* --------------------------------------------------------------------- */



static struct attribute *wan_attributes[] = {

	&dev_attr_wan_enable.attr,

	&dev_attr_wwan_enable.attr,

	NULL

};
@@ -8138,7 +8140,8 @@ static ssize_t fan_pwm1_enable_store(struct device *dev, 
	return count;

}



static DEVICE_ATTR_RW(fan_pwm1_enable);

static DEVICE_ATTR(pwm1_enable, S_IWUSR | S_IRUGO,

		   fan_pwm1_enable_show, fan_pwm1_enable_store);



/* sysfs fan pwm1 ------------------------------------------------------ */

static ssize_t fan_pwm1_show(struct device *dev,
@@ -8198,7 +8201,7 @@ static ssize_t fan_pwm1_store(struct device *dev, 
	return (rc) ? rc : count;

}



static DEVICE_ATTR_RW(fan_pwm1);

static DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, fan_pwm1_show, fan_pwm1_store);



/* sysfs fan fan1_input ------------------------------------------------ */

static ssize_t fan_fan1_input_show(struct device *dev,
@@ -8215,7 +8218,7 @@ static ssize_t fan_fan1_input_show(struct device *dev, 
	return snprintf(buf, PAGE_SIZE, "%u\n", speed);

}



static DEVICE_ATTR_RO(fan_fan1_input);

static DEVICE_ATTR(fan1_input, S_IRUGO, fan_fan1_input_show, NULL);



/* sysfs fan fan2_input ------------------------------------------------ */

static ssize_t fan_fan2_input_show(struct device *dev,
@@ -8232,7 +8235,7 @@ static ssize_t fan_fan2_input_show(struct device *dev, 
	return snprintf(buf, PAGE_SIZE, "%u\n", speed);

}



static DEVICE_ATTR_RO(fan_fan2_input);

static DEVICE_ATTR(fan2_input, S_IRUGO, fan_fan2_input_show, NULL);



/* sysfs fan fan_watchdog (hwmon driver) ------------------------------- */

static ssize_t fan_fan_watchdog_show(struct device_driver *drv,
@@ -8265,8 +8268,8 @@ static DRIVER_ATTR(fan_watchdog, S_IWUSR | S_IRUGO, 


/* --------------------------------------------------------------------- */

static struct attribute *fan_attributes[] = {

	&dev_attr_fan_pwm1_enable.attr, &dev_attr_fan_pwm1.attr,

	&dev_attr_fan_fan1_input.attr,

	&dev_attr_pwm1_enable.attr, &dev_attr_pwm1.attr,

	&dev_attr_fan1_input.attr,

	NULL, /* for fan2_input */

	NULL

};
@@ -8400,7 +8403,7 @@ static int __init fan_init(struct ibm_init_struct *iibm) 
		if (tp_features.second_fan) {

			/* attach second fan tachometer */

			fan_attributes[ARRAY_SIZE(fan_attributes)-2] =

					&dev_attr_fan_fan2_input.attr;

					&dev_attr_fan2_input.attr;

		}

		rc = sysfs_create_group(&tpacpi_sensors_pdev->dev.kobj,

					 &fan_attr_group);
@@ -8848,7 +8851,7 @@ static ssize_t thinkpad_acpi_pdev_name_show(struct device *dev, 
	return snprintf(buf, PAGE_SIZE, "%s\n", TPACPI_NAME);

}



static DEVICE_ATTR_RO(thinkpad_acpi_pdev_name);

static DEVICE_ATTR(name, S_IRUGO, thinkpad_acpi_pdev_name_show, NULL);



/* --------------------------------------------------------------------- */
@@ -9390,8 +9393,7 @@ static void thinkpad_acpi_module_exit(void) 
		hwmon_device_unregister(tpacpi_hwmon);



	if (tp_features.sensors_pdev_attrs_registered)

		device_remove_file(&tpacpi_sensors_pdev->dev,

				   &dev_attr_thinkpad_acpi_pdev_name);

		device_remove_file(&tpacpi_sensors_pdev->dev, &dev_attr_name);

	if (tpacpi_sensors_pdev)

		platform_device_unregister(tpacpi_sensors_pdev);

	if (tpacpi_pdev)
@@ -9512,8 +9514,7 @@ static int __init thinkpad_acpi_module_init(void) 
		thinkpad_acpi_module_exit();

		return ret;

	}

	ret = device_create_file(&tpacpi_sensors_pdev->dev,

				 &dev_attr_thinkpad_acpi_pdev_name);

	ret = device_create_file(&tpacpi_sensors_pdev->dev, &dev_attr_name);

	if (ret) {

		pr_err("unable to create sysfs hwmon device attributes\n");

		thinkpad_acpi_module_exit();

CRA Git | Maintained and supported by SUSTech CRA and CCSE