From: "Michał Kępień" <kernel@kempniu.pl>
To: Alex Hung <alex.hung@canonical.com>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>
Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] platform/x86: intel-hid: use devm_input_allocate_device() for HID events input device
Date: Fri, 24 Feb 2017 11:33:08 +0100 [thread overview]
Message-ID: <20170224103309.19463-4-kernel@kempniu.pl> (raw)
In-Reply-To: <20170224103309.19463-1-kernel@kempniu.pl>
intel_hid_input_setup() is only called from the platform driver's .probe
callback. Use the devm variant of input_allocate_device() for
allocating memory for the HID events input device in order to simplify
two error paths and get rid of intel_hid_input_destroy().
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
drivers/platform/x86/intel-hid.c | 31 +++++--------------------------
1 file changed, 5 insertions(+), 26 deletions(-)
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index 89d1d98e3214..b17f33b832c2 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -144,28 +144,20 @@ static int intel_hid_input_setup(struct platform_device *device)
struct intel_hid_priv *priv = dev_get_drvdata(&device->dev);
int ret;
- priv->input_dev = input_allocate_device();
+ priv->input_dev = devm_input_allocate_device(&device->dev);
if (!priv->input_dev)
return -ENOMEM;
ret = sparse_keymap_setup(priv->input_dev, intel_hid_keymap, NULL);
if (ret)
- goto err_free_device;
+ return ret;
priv->input_dev->dev.parent = &device->dev;
priv->input_dev->name = "Intel HID events";
priv->input_dev->id.bustype = BUS_HOST;
set_bit(KEY_RFKILL, priv->input_dev->keybit);
- ret = input_register_device(priv->input_dev);
- if (ret)
- goto err_free_device;
-
- return 0;
-
-err_free_device:
- input_free_device(priv->input_dev);
- return ret;
+ return input_register_device(priv->input_dev);
}
static int intel_button_array_input_setup(struct platform_device *device)
@@ -189,13 +181,6 @@ static int intel_button_array_input_setup(struct platform_device *device)
return input_register_device(priv->array);
}
-static void intel_hid_input_destroy(struct platform_device *device)
-{
- struct intel_hid_priv *priv = dev_get_drvdata(&device->dev);
-
- input_unregister_device(priv->input_dev);
-}
-
static void notify_handler(acpi_handle handle, u32 event, void *context)
{
struct platform_device *device = context;
@@ -270,10 +255,8 @@ static int intel_hid_probe(struct platform_device *device)
ACPI_DEVICE_NOTIFY,
notify_handler,
device);
- if (ACPI_FAILURE(status)) {
- err = -EBUSY;
- goto err_remove_input;
- }
+ if (ACPI_FAILURE(status))
+ return -EBUSY;
err = intel_hid_set_enable(&device->dev, true);
if (err)
@@ -294,9 +277,6 @@ static int intel_hid_probe(struct platform_device *device)
err_remove_notify:
acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler);
-err_remove_input:
- intel_hid_input_destroy(device);
-
return err;
}
@@ -305,7 +285,6 @@ static int intel_hid_remove(struct platform_device *device)
acpi_handle handle = ACPI_HANDLE(&device->dev);
acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler);
- intel_hid_input_destroy(device);
intel_hid_set_enable(&device->dev, false);
intel_button_array_enable(&device->dev, false);
--
2.11.1
next prev parent reply other threads:[~2017-02-24 10:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 10:33 [PATCH 0/4] Improve intel-hid's self-consistency Michał Kępień
2017-02-24 10:33 ` [PATCH 1/4] platform/x86: intel-hid: simplify enabling/disabling HID events Michał Kępień
2017-02-24 10:33 ` [PATCH 2/4] platform/x86: intel-hid: make intel_hid_set_enable() take a boolean argument Michał Kępień
2017-02-24 10:33 ` Michał Kępień [this message]
2017-02-24 10:33 ` [PATCH 4/4] platform/x86: intel-hid: remove redundant set_bit() call Michał Kępień
2017-03-01 23:03 ` [PATCH 0/4] Improve intel-hid's self-consistency Andy Shevchenko
2017-03-02 10:17 ` Alex Hung
2017-03-03 18:27 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170224103309.19463-4-kernel@kempniu.pl \
--to=kernel@kempniu.pl \
--cc=alex.hung@canonical.com \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).