From patchwork Wed Jun 29 03:41:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 9204263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C2AA60752 for ; Wed, 29 Jun 2016 03:42:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A09628642 for ; Wed, 29 Jun 2016 03:42:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D7522863F; Wed, 29 Jun 2016 03:42:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6635C2863F for ; Wed, 29 Jun 2016 03:42:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752574AbcF2DmD (ORCPT ); Tue, 28 Jun 2016 23:42:03 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:45721 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752455AbcF2DmB (ORCPT ); Tue, 28 Jun 2016 23:42:01 -0400 Received: from 1.general.alexhung.us.vpn ([10.172.65.254] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1bI6NM-0003Yg-6E; Wed, 29 Jun 2016 03:41:20 +0000 From: Alex Hung To: alex.hung@canonical.com, dvhart@infradead.org, platform-driver-x86@vger.kernel.org Subject: [PATCH][V2] intel-hid: remove duplicated acpi_remove_notify_handler and extra indents Date: Wed, 29 Jun 2016 11:41:15 +0800 Message-Id: <1467171675-32174-1-git-send-email-alex.hung@canonical.com> X-Mailer: git-send-email 2.7.4 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Two lines are indented incorrectly and is fixed. The second call to acpi_remove_notify_handler does not result in panic or generate error messages, but it is unnecessary and the function returns with an error. Signed-off-by: Alex Hung --- drivers/platform/x86/intel-hid.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c index a818db6..ed58742 100644 --- a/drivers/platform/x86/intel-hid.c +++ b/drivers/platform/x86/intel-hid.c @@ -122,8 +122,8 @@ static int intel_hid_input_setup(struct platform_device *device) return 0; err_free_device: - input_free_device(priv->input_dev); - return ret; + input_free_device(priv->input_dev); + return ret; } static void intel_hid_input_destroy(struct platform_device *device) @@ -224,7 +224,6 @@ static int intel_hid_remove(struct platform_device *device) acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler); intel_hid_input_destroy(device); intel_hid_set_enable(&device->dev, 0); - acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler); /* * Even if we failed to shut off the event stream, we can still