diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-10-28 12:38:26 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-10-28 12:38:26 +0100 |
commit | 65133033ee6ee34724ea3d82d5d1cfc6839ffdae (patch) | |
tree | 2fca9fd5630bbfd503a75e3cc69f30056a629c92 /drivers/platform/x86/classmate-laptop.c | |
parent | Merge tag 'perf-core-for-mingo-5.5-20191021' of git://git.kernel.org/pub/scm/... (diff) | |
parent | perf/headers: Fix spelling s/EACCESS/EACCES/, s/privilidge/privilege/ (diff) | |
download | linux-65133033ee6ee34724ea3d82d5d1cfc6839ffdae.tar.xz linux-65133033ee6ee34724ea3d82d5d1cfc6839ffdae.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/platform/x86/classmate-laptop.c')
-rw-r--r-- | drivers/platform/x86/classmate-laptop.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c index 86cc2cc68fb5..af063f690846 100644 --- a/drivers/platform/x86/classmate-laptop.c +++ b/drivers/platform/x86/classmate-laptop.c @@ -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); } |