From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936879AbdAKI7s (ORCPT ); Wed, 11 Jan 2017 03:59:48 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:32873 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936820AbdAKI7p (ORCPT ); Wed, 11 Jan 2017 03:59:45 -0500 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Jonathan Woithe , Darren Hart Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] platform/x86: fujitsu-laptop: make hotkey handling functions more similar Date: Wed, 11 Jan 2017 09:59:33 +0100 Message-Id: <20170111085933.2486-5-kernel@kempniu.pl> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170111085933.2486-1-kernel@kempniu.pl> References: <20170111085933.2486-1-kernel@kempniu.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make two minor tweaks to acpi_fujitsu_hotkey_press() to make it more similar to acpi_fujitsu_hotkey_release(): * call vdbg_printk() after reporting the input event, * return immediately when kfifo_in_locked() fails. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 06653a8594ed..96f8163d5002 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -1035,18 +1035,18 @@ static void acpi_fujitsu_hotkey_press(int keycode) struct input_dev *input = fujitsu_hotkey->input; int status; - vdbg_printk(FUJLAPTOP_DBG_TRACE, - "Push keycode into ringbuffer [%d]\n", keycode); status = kfifo_in_locked(&fujitsu_hotkey->fifo, (unsigned char *)&keycode, sizeof(keycode), &fujitsu_hotkey->fifo_lock); if (status != sizeof(keycode)) { vdbg_printk(FUJLAPTOP_DBG_WARN, "Could not push keycode [0x%x]\n", keycode); - } else { - input_report_key(input, keycode, 1); - input_sync(input); + return; } + input_report_key(input, keycode, 1); + input_sync(input); + vdbg_printk(FUJLAPTOP_DBG_TRACE, + "Push keycode into ringbuffer [%d]\n", keycode); } static void acpi_fujitsu_hotkey_release(void) -- 2.11.0