Commit fe7d2c23 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'platform-drivers-x86-v5.4-3' of git://git.infradead.org/linux-platform-drivers-x86

Pull x86 platform driver fixes from Andy Shevchenko:

 - Users of Intel P-Unit IPC driver might be surprised by harmless
   warning. Thus, switch to API which doesn't issue a warning at all.

 - I²C multi-instantiate driver continues to add slave devices even when
   IRQ resource is not found. For devices in the market IRQ resource is
   mandatory, so, fail the ->probe() of the parent driver to avoid
   slaves being probed.

 - Avoid compiler warning due to unused variable in Classmate laptop
   driver.

* tag 'platform-drivers-x86-v5.4-3' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: i2c-multi-instantiate: Fail the probe if no IRQ provided
  platform/x86: intel_punit_ipc: Avoid error message when retrieving IRQ
  platform/x86: classmate-laptop: remove unused variable
parents 7801158f 832392db
...@@ -420,12 +420,6 @@ static int cmpc_accel_add_v4(struct acpi_device *acpi) ...@@ -420,12 +420,6 @@ static int cmpc_accel_add_v4(struct acpi_device *acpi)
static int cmpc_accel_remove_v4(struct acpi_device *acpi) static int cmpc_accel_remove_v4(struct acpi_device *acpi)
{ {
struct input_dev *inputdev;
struct cmpc_accel *accel;
inputdev = dev_get_drvdata(&acpi->dev);
accel = dev_get_drvdata(&inputdev->dev);
device_remove_file(&acpi->dev, &cmpc_accel_sensitivity_attr_v4); device_remove_file(&acpi->dev, &cmpc_accel_sensitivity_attr_v4);
device_remove_file(&acpi->dev, &cmpc_accel_g_select_attr_v4); device_remove_file(&acpi->dev, &cmpc_accel_g_select_attr_v4);
return cmpc_remove_acpi_notify_device(acpi); return cmpc_remove_acpi_notify_device(acpi);
...@@ -656,12 +650,6 @@ static int cmpc_accel_add(struct acpi_device *acpi) ...@@ -656,12 +650,6 @@ static int cmpc_accel_add(struct acpi_device *acpi)
static int cmpc_accel_remove(struct acpi_device *acpi) static int cmpc_accel_remove(struct acpi_device *acpi)
{ {
struct input_dev *inputdev;
struct cmpc_accel *accel;
inputdev = dev_get_drvdata(&acpi->dev);
accel = dev_get_drvdata(&inputdev->dev);
device_remove_file(&acpi->dev, &cmpc_accel_sensitivity_attr); device_remove_file(&acpi->dev, &cmpc_accel_sensitivity_attr);
return cmpc_remove_acpi_notify_device(acpi); return cmpc_remove_acpi_notify_device(acpi);
} }
......
...@@ -108,6 +108,7 @@ static int i2c_multi_inst_probe(struct platform_device *pdev) ...@@ -108,6 +108,7 @@ static int i2c_multi_inst_probe(struct platform_device *pdev)
if (ret < 0) { if (ret < 0) {
dev_dbg(dev, "Error requesting irq at index %d: %d\n", dev_dbg(dev, "Error requesting irq at index %d: %d\n",
inst_data[i].irq_idx, ret); inst_data[i].irq_idx, ret);
goto error;
} }
board_info.irq = ret; board_info.irq = ret;
break; break;
......
...@@ -293,9 +293,8 @@ static int intel_punit_ipc_probe(struct platform_device *pdev) ...@@ -293,9 +293,8 @@ static int intel_punit_ipc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, punit_ipcdev); platform_set_drvdata(pdev, punit_ipcdev);
irq = platform_get_irq(pdev, 0); irq = platform_get_irq_optional(pdev, 0);
if (irq < 0) { if (irq < 0) {
punit_ipcdev->irq = 0;
dev_warn(&pdev->dev, "Invalid IRQ, using polling mode\n"); dev_warn(&pdev->dev, "Invalid IRQ, using polling mode\n");
} else { } else {
ret = devm_request_irq(&pdev->dev, irq, intel_punit_ioc, ret = devm_request_irq(&pdev->dev, irq, intel_punit_ioc,
......
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