From patchwork Fri Apr 7 13:07:13 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: 9669475 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 268E4602B3 for ; Fri, 7 Apr 2017 13:07:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 165FF285E4 for ; Fri, 7 Apr 2017 13:07:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B42D285EE; Fri, 7 Apr 2017 13:07:33 +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 BAB78285E4 for ; Fri, 7 Apr 2017 13:07:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756141AbdDGNHb (ORCPT ); Fri, 7 Apr 2017 09:07:31 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:36487 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932534AbdDGNHX (ORCPT ); Fri, 7 Apr 2017 09:07:23 -0400 Received: by mail-lf0-f68.google.com with SMTP id n78so6094896lfi.3 for ; Fri, 07 Apr 2017 06:07:22 -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=kZP9WE+CNUZk56MEWmzfSpNpkcfEo/fvomF4e4ypngM=; b=Kwb93aDnd2RUwmPP9nZ5rqZB27jGUzH41/gCFRVPIjswSD+B2fUuvxPNiWBkpQyRXR 4Z4VaVlkDWZ3oqLRzzxsgy3kBxtAYGA9oqU0prFffp/7uAR7V97k0v9voZ8Kvhe0MITa Hls7sBQdsM5dUtvCvXjCbC5fztJWenSbQz0G8= 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=kZP9WE+CNUZk56MEWmzfSpNpkcfEo/fvomF4e4ypngM=; b=rFogi49DxBBpH4o9ipFbwpCukyA6Xu08EEq7LFSyKA1l6U5IJvAIdj6J+9Ep1iKfF0 MLgdkM0tzM54pGlnmtJSvKuiGYuGhVsmBsrHHCcSE+X3OfEwOWzkLjPal8tN2J34Tm0O CkPruGgwTw5xpfzfItum/Jm1lMgk66E3On6nToxXBdU7843JHOxcOdeCEcT5qAVNgw6D iisOvTYKTwxCVR5f1mlACn8iJYqD/BqTJFmJb2Z1KDkKSSylE+hYByDT3JdTou+p9/fL zYKqIce4VY9lIKr/AZZBWcMNQ2/9K3y1QjsKCC6JyuhplwozU9R0JSV3/fAWHpmVZI06 nrog== X-Gm-Message-State: AFeK/H2IQQ/82o65uEB95mTIZ0R4yy05J7d3eyb72pRz+OxmRyTHGpcFvIcFBnSF3RhhgA== X-Received: by 10.25.153.142 with SMTP id b136mr13247572lfe.85.1491570441804; Fri, 07 Apr 2017 06:07:21 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Apr 2017 06:07:21 -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 6/6] platform/x86: fujitsu-laptop: simplify error handling in acpi_fujitsu_laptop_add() Date: Fri, 7 Apr 2017 15:07:13 +0200 Message-Id: <20170407130713.8417-7-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 As LED class devices registered by fujitsu-laptop no longer depend on the platform device, two function calls inside acpi_fujitsu_laptop_add() can be rearranged in order to simplify error handling. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 177b9b57ac2f..2d3d0e4083dc 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -860,18 +860,16 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) fujitsu_bl->bl_device->props.power = FB_BLANK_UNBLANK; } - error = fujitsu_laptop_platform_add(); + error = acpi_fujitsu_laptop_leds_register(device); if (error) goto err_free_fifo; - error = acpi_fujitsu_laptop_leds_register(device); + error = fujitsu_laptop_platform_add(); if (error) - goto err_remove_platform_device; + goto err_free_fifo; return 0; -err_remove_platform_device: - fujitsu_laptop_platform_remove(); err_free_fifo: kfifo_free(&fujitsu_laptop->fifo); err_stop: