From patchwork Fri Jan 13 11:02:37 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: 9515229 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 8ACB4601DA for ; Fri, 13 Jan 2017 11:04:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 817E5285A1 for ; Fri, 13 Jan 2017 11:04:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7645D2862E; Fri, 13 Jan 2017 11:04:35 +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 2E0E5285A1 for ; Fri, 13 Jan 2017 11:04:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751516AbdAMLCr (ORCPT ); Fri, 13 Jan 2017 06:02:47 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:35688 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751413AbdAMLCq (ORCPT ); Fri, 13 Jan 2017 06:02:46 -0500 Received: by mail-lf0-f66.google.com with SMTP id v186so5177613lfa.2 for ; Fri, 13 Jan 2017 03:02:45 -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=cib8yCrBnPi54cVzMkIZfAd4grTxzyEcB0RNMBYXVCU=; b=KtMlnETYa9HeKvfcn4oRzhh+K4uU2TXmFNyd3xJ8/mxHcJMrZ6pnlu9AQ5z3P3eKeg pS/ITzcl5rC+uCz3a2QiLi/8jRmue3bqSjjB9xj2KQmrVpE9wzvYbhe85dPJqELdvNwv xeT3yGqxOAQ3FMJRHD3cyjLZHW92oiKSWngQg= 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=cib8yCrBnPi54cVzMkIZfAd4grTxzyEcB0RNMBYXVCU=; b=sPQhBJ6vyVhv+0rQa4SlDp8zDsc/iG/0FKZOPrw+gFSAiu5Iu8AxAFWqA6CcE70OPy WjrzXqA7pe2pv2VfVVL12GLp044uH0lm6EZ2vdxEemX6rocfj+hIRUfiJOWi+4PRjco1 N2zdUCGhDWTQ3YFvlPHAyznTn2NWGKdxm8Kod5PsotP81B24ZMbOCWc5TBP8ohnj8TqN lu7bnCAlO+/TjqKzaLHXZ2ku7Rkfu65VFXorn3Tu5iH5XnuTLoGA+6J7Zko7toi5ca3v ZaTckFp8S5pyzCfuMx7Cw791HVRgY2AyXMuHR0kNpIq12fMwFc3P96gjIM1LGaI77Qe5 cpOg== X-Gm-Message-State: AIkVDXJT8tEJwpV5lbMthvKDYC8OsehDh2+35o1ZzSpjKnBU0lZcMB6ruqt1RbXstn0JDw== X-Received: by 10.46.78.10 with SMTP id c10mr7289432ljb.77.1484305364310; Fri, 13 Jan 2017 03:02:44 -0800 (PST) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id j87sm3666151lfi.25.2017.01.13.03.02.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jan 2017 03:02:43 -0800 (PST) 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 1/4] platform/x86: fujitsu-laptop: simplify acpi_bus_register_driver() error handling Date: Fri, 13 Jan 2017 12:02:37 +0100 Message-Id: <20170113110240.622-2-kernel@kempniu.pl> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170113110240.622-1-kernel@kempniu.pl> References: <20170113110240.622-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 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: 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 b725a907a91f..9f62d9e1b0de 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -1176,7 +1176,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; @@ -1191,11 +1191,9 @@ static int __init fujitsu_init(void) fujitsu->keycode5 = KEY_RFKILL; dmi_check_system(fujitsu_dmi_table); - result = acpi_bus_register_driver(&acpi_fujitsu_driver); - if (result < 0) { - ret = -ENODEV; + ret = acpi_bus_register_driver(&acpi_fujitsu_driver); + if (ret) goto fail_acpi; - } /* Register platform stuff */ @@ -1248,11 +1246,9 @@ static int __init fujitsu_init(void) goto fail_hotkey; } - result = acpi_bus_register_driver(&acpi_fujitsu_hotkey_driver); - if (result < 0) { - ret = -ENODEV; + ret = acpi_bus_register_driver(&acpi_fujitsu_hotkey_driver); + if (ret) goto fail_hotkey1; - } /* Sync backlight power status (needs FUJ02E3 device, hence deferred) */ if (acpi_video_get_backlight_type() == acpi_backlight_vendor) {