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

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

Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 

Pull x86 platform updates from Matthew Garrett:
 "Nothing amazing here, almost entirely cleanups and minor bugfixes and
  one bit of hardware enablement in the amilo-rfkill driver"

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
  platform/x86: panasonic-laptop: reuse module_acpi_driver
  samsung-laptop: fix config build error
  platform: x86: remove unnecessary platform_set_drvdata()
  amilo-rfkill: Enable using amilo-rfkill with the FSC Amilo L1310.
  wmi: parse_wdg() should return kernel error codes
  hp_wmi: Fix unregister order in hp_wmi_rfkill_setup()
  platform: replace strict_strto*() with kstrto*()
  x86: irst: use module_acpi_driver to simplify the code
  x86: smartconnect: use module_acpi_driver to simplify the code
  platform samsung-q10: use ACPI instead of direct EC calls
  thinkpad_acpi: add the ability setting TPACPI_LED_NONE by quirk
  thinkpad_acpi: return -NODEV while operating uninitialized LEDs
parents 0375ec58 5c07eae9

drivers/platform/x86/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -732,6 +732,7 @@ config SAMSUNG_LAPTOP 
	tristate "Samsung Laptop driver"

	depends on X86

	depends on RFKILL || RFKILL = n

	depends on ACPI_VIDEO || ACPI_VIDEO = n

	depends on BACKLIGHT_CLASS_DEVICE

	select LEDS_CLASS

	select NEW_LEDS
@@ -764,7 +765,7 @@ config INTEL_OAKTRAIL 


config SAMSUNG_Q10

	tristate "Samsung Q10 Extras"

	depends on SERIO_I8042

	depends on ACPI

	select BACKLIGHT_CLASS_DEVICE

	---help---

	  This driver provides support for backlight control on Samsung Q10

drivers/platform/x86/amilo-rfkill.c

+7 −0
Original line number Diff line number Diff line
@@ -82,6 +82,13 @@ static const struct dmi_system_id amilo_rfkill_id_table[] = { 
		},

		.driver_data = (void *)&amilo_a1655_rfkill_ops

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),

			DMI_MATCH(DMI_BOARD_NAME, "AMILO L1310"),

		},

		.driver_data = (void *)&amilo_a1655_rfkill_ops

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),

drivers/platform/x86/classmate-laptop.c

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ static ssize_t cmpc_accel_sensitivity_store(struct device *dev, 
	inputdev = dev_get_drvdata(&acpi->dev);

	accel = dev_get_drvdata(&inputdev->dev);



	r = strict_strtoul(buf, 0, &sensitivity);

	r = kstrtoul(buf, 0, &sensitivity);

	if (r)

		return r;

drivers/platform/x86/compal-laptop.c

+4 −3
Original line number Diff line number Diff line
@@ -425,7 +425,8 @@ static ssize_t pwm_enable_store(struct device *dev, 
	struct compal_data *data = dev_get_drvdata(dev);

	long val;

	int err;

	err = strict_strtol(buf, 10, &val);



	err = kstrtol(buf, 10, &val);

	if (err)

		return err;

	if (val < 0)
@@ -463,7 +464,8 @@ static ssize_t pwm_store(struct device *dev, struct device_attribute *attr, 
	struct compal_data *data = dev_get_drvdata(dev);

	long val;

	int err;

	err = strict_strtol(buf, 10, &val);



	err = kstrtol(buf, 10, &val);

	if (err)

		return err;

	if (val < 0 || val > 255)
@@ -1081,7 +1083,6 @@ static int compal_remove(struct platform_device *pdev) 
	hwmon_device_unregister(data->hwmon_dev);

	power_supply_unregister(&data->psy);



	platform_set_drvdata(pdev, NULL);

	kfree(data);



	sysfs_remove_group(&pdev->dev.kobj, &compal_attribute_group);

drivers/platform/x86/hp-wmi.c

+8 −8
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ static int hp_wmi_rfkill_setup(struct platform_device *device) 
					   (void *) HPWMI_WWAN);

		if (!wwan_rfkill) {

			err = -ENOMEM;

			goto register_gps_error;

			goto register_bluetooth_error;

		}

		rfkill_init_sw_state(wwan_rfkill,

				     hp_wmi_get_sw_state(HPWMI_WWAN));
@@ -733,7 +733,7 @@ static int hp_wmi_rfkill_setup(struct platform_device *device) 
				    hp_wmi_get_hw_state(HPWMI_WWAN));

		err = rfkill_register(wwan_rfkill);

		if (err)

			goto register_wwan_err;

			goto register_wwan_error;

	}



	if (wireless & 0x8) {
@@ -743,7 +743,7 @@ static int hp_wmi_rfkill_setup(struct platform_device *device) 
						(void *) HPWMI_GPS);

		if (!gps_rfkill) {

			err = -ENOMEM;

			goto register_bluetooth_error;

			goto register_wwan_error;

		}

		rfkill_init_sw_state(gps_rfkill,

				     hp_wmi_get_sw_state(HPWMI_GPS));
@@ -755,16 +755,16 @@ static int hp_wmi_rfkill_setup(struct platform_device *device) 
	}



	return 0;

register_wwan_err:

	rfkill_destroy(wwan_rfkill);

	wwan_rfkill = NULL;

	if (gps_rfkill)

		rfkill_unregister(gps_rfkill);

register_gps_error:

	rfkill_destroy(gps_rfkill);

	gps_rfkill = NULL;

	if (bluetooth_rfkill)

		rfkill_unregister(bluetooth_rfkill);

register_wwan_error:

	rfkill_destroy(wwan_rfkill);

	wwan_rfkill = NULL;

	if (gps_rfkill)

		rfkill_unregister(gps_rfkill);

register_bluetooth_error:

	rfkill_destroy(bluetooth_rfkill);

	bluetooth_rfkill = NULL;