summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Kępień <kernel@kempniu.pl>2017-03-09 10:36:51 +0100
committerDarren Hart <dvhart@infradead.org>2017-03-14 22:58:12 -0700
commit1fe55309462cc9b2dcefe6eb91e7adeba5e59e89 (patch)
tree25a629d926d17a619f3a6e4561181807bad7c6d0
parentdb8f95d0141926a673484d228cd4040f5b10972f (diff)
downloadlinux-stable-1fe55309462cc9b2dcefe6eb91e7adeba5e59e89.tar.gz
linux-stable-1fe55309462cc9b2dcefe6eb91e7adeba5e59e89.tar.bz2
linux-stable-1fe55309462cc9b2dcefe6eb91e7adeba5e59e89.zip
platform/x86: intel-hid: do not set parents of input devices explicitly
devm_input_allocate_device() already causes the supplied struct device to be set as the parent of the input device, so doing it again is redundant. Signed-off-by: Michał Kępień <kernel@kempniu.pl> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-and-tested-by: Alex Hung <alex.hung@canonical.com>
-rw-r--r--drivers/platform/x86/intel-hid.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index 5eab31659cba..b40059aba856 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -152,7 +152,6 @@ static int intel_hid_input_setup(struct platform_device *device)
if (ret)
return ret;
- priv->input_dev->dev.parent = &device->dev;
priv->input_dev->name = "Intel HID events";
priv->input_dev->id.bustype = BUS_HOST;
@@ -173,7 +172,6 @@ static int intel_button_array_input_setup(struct platform_device *device)
if (ret)
return ret;
- priv->array->dev.parent = &device->dev;
priv->array->name = "Intel HID 5 button array";
priv->array->id.bustype = BUS_HOST;