From patchwork Fri Apr 7 13:07:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 9669473 X-Patchwork-Delegate: dvhart@infradead.org 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 16DE9602B3 for ; Fri, 7 Apr 2017 13:07:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09775285E4 for ; Fri, 7 Apr 2017 13:07:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F23CA285EE; Fri, 7 Apr 2017 13:07:31 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 7DB1D285E4 for ; Fri, 7 Apr 2017 13:07:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933499AbdDGNHa (ORCPT ); Fri, 7 Apr 2017 09:07:30 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:36484 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756124AbdDGNHW (ORCPT ); Fri, 7 Apr 2017 09:07:22 -0400 Received: by mail-lf0-f67.google.com with SMTP id n78so6094865lfi.3 for ; Fri, 07 Apr 2017 06:07:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/pP4LTBZKT4XNfKRundgepAkLAdxyy0HyLDnxNbPb28=; b=kKgei7RNe4NIDNRgCis/Xh4uBBZdnYwJSIjoPeNtz/qFBooFs0pv59M72S6Kp0F77H nNr455AZNzH5GfohkoLUsbJ8AZ4mSdxMJaBkEO5b/ndF1Agnk7+bxMX3pL4wGvoLvQTM y9yaaYKZjyNjfIoAk5dJdMt7Fm6MluCgke9vc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/pP4LTBZKT4XNfKRundgepAkLAdxyy0HyLDnxNbPb28=; b=A8qB/L3qPj9fAF8S87JmjPa+QmzZ5PWpmVBtBcvsibABriRJN1U+nUdT1LBHicGADK 5fCTdds7emfD+nKuj204OPiH6QtVaQJCLWzl5zQpvyLypu1XpAzyi23zoPbND6iDGLMT D+3CkoRk2hqnqJXJIkj/VZdWhsUL1RL1ZkxXcsGHhQdx+r52JH0O1PIvKKHLk7F1E2c3 ssMnNvzYfQ8iOnRaMtEwZKWJnTEZUi9H/Cwcswda5RcHGBlVjpH/X78LBagdQoGHOh/s T/UANJY/dKhZlA15nQfQA/L/1eABsLaCB5bd6iQsEAAy3C2TgoHJzbhCHijozO7/UksL B9cg== X-Gm-Message-State: AFeK/H1KnpPNAzlIjSxxoiee1RwAhMYkasRejMWKR7Q36XunzUgpdlLkzJbH/DT+DP8C1A== X-Received: by 10.25.225.79 with SMTP id y76mr11331095lfg.96.1491570440668; Fri, 07 Apr 2017 06:07:20 -0700 (PDT) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id 17sm961440ljp.58.2017.04.07.06.07.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Apr 2017 06:07:20 -0700 (PDT) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Jonathan Woithe , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] platform/x86: fujitsu-laptop: do not log LED registration failures Date: Fri, 7 Apr 2017 15:07:12 +0200 Message-Id: <20170407130713.8417-6-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170407130713.8417-1-kernel@kempniu.pl> References: <20170407130713.8417-1-kernel@kempniu.pl> MIME-Version: 1.0 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 If acpi_fujitsu_laptop_leds_register() returns an error, the latter will become the return value of acpi_fujitsu_laptop_add(), which in turn will be reported by driver core. Simplify code by replacing pr_err() calls with return statements. Return 0 instead of result when no errors occur in order to make the code easier to read. Signed-off-by: Michał Kępień Reviewed-by: Jonathan Woithe --- drivers/platform/x86/fujitsu-laptop.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index ce658789e748..177b9b57ac2f 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -739,22 +739,20 @@ static struct led_classdev eco_led = { static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) { - int result = 0; + int result; if (call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & LOGOLAMP_POWERON) { result = devm_led_classdev_register(&device->dev, &logolamp_led); if (result) - pr_err("Could not register LED handler for logo lamp, error %i\n", - result); + return result; } if ((call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & KEYBOARD_LAMPS) && (call_fext_func(FUNC_BUTTONS, 0x0, 0x0, 0x0) == 0x0)) { result = devm_led_classdev_register(&device->dev, &kblamps_led); if (result) - pr_err("Could not register LED handler for keyboard lamps, error %i\n", - result); + return result; } /* @@ -766,8 +764,7 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) if (call_fext_func(FUNC_BUTTONS, 0x0, 0x0, 0x0) & BIT(24)) { result = devm_led_classdev_register(&device->dev, &radio_led); if (result) - pr_err("Could not register LED handler for radio LED, error %i\n", - result); + return result; } /* Support for eco led is not always signaled in bit corresponding @@ -779,11 +776,10 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) (call_fext_func(FUNC_LEDS, 0x2, ECO_LED, 0x0) != UNSUPPORTED_CMD)) { result = devm_led_classdev_register(&device->dev, &eco_led); if (result) - pr_err("Could not register LED handler for eco LED, error %i\n", - result); + return result; } - return result; + return 0; } static int acpi_fujitsu_laptop_add(struct acpi_device *device)