From patchwork Wed Feb 8 13:46:30 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: 9562669 X-Patchwork-Delegate: andy.shevchenko@gmail.com 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 3029560434 for ; Wed, 8 Feb 2017 14:52:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 205BF283F6 for ; Wed, 8 Feb 2017 14:52:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12D48284C2; Wed, 8 Feb 2017 14:52:27 +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=unavailable 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 9650B283F6 for ; Wed, 8 Feb 2017 14:52:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753705AbdBHOw0 (ORCPT ); Wed, 8 Feb 2017 09:52:26 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35700 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754408AbdBHOwZ (ORCPT ); Wed, 8 Feb 2017 09:52:25 -0500 Received: by mail-lf0-f68.google.com with SMTP id v186so9570774lfa.2 for ; Wed, 08 Feb 2017 06:51:28 -0800 (PST) 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=s0kbxeKDJJxqiqLTye3HjsEitJjBR4LTEECApOTY1H4=; b=P+deOmVHVeEVoHQahBrGqEftGXZsK00uDXUmaIXA8NmMO3yXT7pCdQCYwdLWIInQ/F nDPQpX3A+z7dMWSUc4ShFiB+6OjH/r74EvvZVEw2TLz2z+EAINPXEZkxEDboZMA1BWI6 3Z/ZtzgrnBRJbYesP5CkrrItLA5C/EFbwW/Ig= 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=s0kbxeKDJJxqiqLTye3HjsEitJjBR4LTEECApOTY1H4=; b=ly7fBIgPKRgQudRndNi2ATzdFC96oHiJ7RtZ23E0Le1DpHJHp7QcAhvuAXQIsO6/yO CyhBz3poGmLIqwAQ5qc8gOOyciwwfVgrTbVSKOg8HhD1xnAO8yf4cWKpTMvPx2BfHJ0c btfkb1E1S4WqabOBAqOeDSxrUB5r1XfhSkmX9rg/Q0eqOqbF2hRUMhlZkvLODLwCWPAX TlU4cBh1P4v5O1OGyvTg18gENJmgjtDpxI6HBEftnKnWnxRU8E9MpocVCmFpUzMXtzhA gk0+DgHxt25E58cUhPm7cN58o43WD9QetimxnPLMDBSleqcK67VRYhot+lOWWLjCMWnu NIIQ== X-Gm-Message-State: AIkVDXKLqlr2605OESVniVx46P6HN+vkunnYYsUb/lb+97E1lZUYeCnCkkKBCMNFzWNw8w== X-Received: by 10.46.80.86 with SMTP id v22mr8558593ljd.6.1486561668567; Wed, 08 Feb 2017 05:47:48 -0800 (PST) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id m18sm2399684lfe.45.2017.02.08.05.47.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Feb 2017 05:47:48 -0800 (PST) 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 07/10] platform/x86: fujitsu-laptop: simplify acpi_bus_register_driver() error handling Date: Wed, 8 Feb 2017 14:46:30 +0100 Message-Id: <20170208134633.5152-8-kernel@kempniu.pl> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170208134633.5152-1-kernel@kempniu.pl> References: <20170208134633.5152-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 From: Alan Jenkins A separate variable is not needed to handle error codes returned by acpi_bus_register_driver(). If the latter fails, just use the value it returned as the value returned by fujitsu_init(). Signed-off-by: Alan Jenkins [kempniu: rebase patch, rewrite commit message] Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index ba0c0c211251..a5478a011b90 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -1192,7 +1192,7 @@ MODULE_DEVICE_TABLE(acpi, fujitsu_ids); static int __init fujitsu_init(void) { - int ret, result, max_brightness; + int ret, max_brightness; if (acpi_disabled) return -ENODEV; @@ -1207,11 +1207,9 @@ static int __init fujitsu_init(void) fujitsu_bl->keycode5 = KEY_RFKILL; dmi_check_system(fujitsu_dmi_table); - result = acpi_bus_register_driver(&acpi_fujitsu_bl_driver); - if (result < 0) { - ret = -ENODEV; + ret = acpi_bus_register_driver(&acpi_fujitsu_bl_driver); + if (ret) goto fail_acpi; - } /* Register platform stuff */ @@ -1264,11 +1262,9 @@ static int __init fujitsu_init(void) goto fail_laptop; } - result = acpi_bus_register_driver(&acpi_fujitsu_laptop_driver); - if (result < 0) { - ret = -ENODEV; + ret = acpi_bus_register_driver(&acpi_fujitsu_laptop_driver); + if (ret) goto fail_laptop1; - } /* Sync backlight power status (needs FUJ02E3 device, hence deferred) */ if (acpi_video_get_backlight_type() == acpi_backlight_vendor) {