platform-drivers-x86 for v5.4-3
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. The following is an automated git shortlog grouped by driver: classmate-laptop: - remove unused variable i2c-multi-instantiate: - Fail the probe if no IRQ provided intel_punit_ipc: - Avoid error message when retrieving IRQ -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqaflIX74DDDzMJJtb7wzTHR8rCgFAl2oJjgACgkQb7wzTHR8 rCiqIhAAwS3WO6HJultOU75VE4IvHGyaXItnq7wm/tiJm5kEWUgVLid9+p/nwax2 nLQjY1OlP50p7rdZWoIOLB9oZfJmOjzOSr7chxQjKVN1Nvwq1y7cBhNgZX/3d1fk THZcA8RbXMnVpmUNbuAK7IW5H6mh82J4jD7JT9kI75JQCs9+42uoTJBYbRnE2H6j 3V6WSV8y5r0mIxumnd7JyEgpSkDF31OG5r1jJvOG9oHxszPxEOmLzOFw2sBQLcLz oVJwAOI3ChSA1bOKFveAiDUtZo1Ndvy1c0c1ce0SWrdCecDudKmp8mdvExl/R9OW OJOTmTfDuTvdO2TJ9LEJxwOvdox1LNQNQk2hlSktExePR9xptIfOcV7PWqcl33sR qfIF3P0XR80Nwy5DVhZYZCoIa2TYrkP4sYBck9mvorB68D4tGxDeohFmupSp/2T8 InK6OGym7u3VMeAdOyJoOais7uvjWqNgRBZcV9zi5BZmOdMwflNOFrLx7JWQmk4B Sw6Av7z0RvKamOaPJJr+wzIfqs+Hc3WTO1haU3kk8BMHnf5jdPQ9v1misF1ZdoKh 0/jnPSYYT0zAS60k5dXW+LNt77KY+bN5Jai2WnTUnI85jqeeWiiS5cusuIMcvG9M n0Qxd20KBB2hgo662/fWe+U/KhmqdDVPmOuOfp/xBBYWJt/lWT0= =dfns -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
fe7d2c23d7
|
@ -420,12 +420,6 @@ failed_sensitivity:
|
|||
|
||||
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_g_select_attr_v4);
|
||||
return cmpc_remove_acpi_notify_device(acpi);
|
||||
|
@ -656,12 +650,6 @@ failed_file:
|
|||
|
||||
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);
|
||||
return cmpc_remove_acpi_notify_device(acpi);
|
||||
}
|
||||
|
|
|
@ -108,6 +108,7 @@ static int i2c_multi_inst_probe(struct platform_device *pdev)
|
|||
if (ret < 0) {
|
||||
dev_dbg(dev, "Error requesting irq at index %d: %d\n",
|
||||
inst_data[i].irq_idx, ret);
|
||||
goto error;
|
||||
}
|
||||
board_info.irq = ret;
|
||||
break;
|
||||
|
|
|
@ -293,9 +293,8 @@ static int intel_punit_ipc_probe(struct platform_device *pdev)
|
|||
|
||||
platform_set_drvdata(pdev, punit_ipcdev);
|
||||
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
irq = platform_get_irq_optional(pdev, 0);
|
||||
if (irq < 0) {
|
||||
punit_ipcdev->irq = 0;
|
||||
dev_warn(&pdev->dev, "Invalid IRQ, using polling mode\n");
|
||||
} else {
|
||||
ret = devm_request_irq(&pdev->dev, irq, intel_punit_ioc,
|
||||
|
|
Загрузка…
Ссылка в новой задаче