From patchwork Fri Mar 10 10:50:36 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: 9615971 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 3E4F160415 for ; Fri, 10 Mar 2017 10:51:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DDCD285A6 for ; Fri, 10 Mar 2017 10:51:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1236C2870E; Fri, 10 Mar 2017 10:51:16 +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 89EAB285A6 for ; Fri, 10 Mar 2017 10:51:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935014AbdCJKvK (ORCPT ); Fri, 10 Mar 2017 05:51:10 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:36343 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935142AbdCJKur (ORCPT ); Fri, 10 Mar 2017 05:50:47 -0500 Received: by mail-lf0-f67.google.com with SMTP id g70so6544540lfh.3 for ; Fri, 10 Mar 2017 02:50:46 -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=wJ77WWQj9h6qheFpLz7oYOSuNmaQgtHdtKoKc+d31KI=; b=F8n/A6zR+8zdfF+nA+wPgoIlup0Xk41HbS3wOnPwgeV42GhkzgOgIOcJAWbZCALZt8 RzgyZ9QMr/caMPSWu44f2NKZEdjefnYu3qHWB/qqTgUqKoY6QJ5mr9pMXn2H+u/KWn1M z03Hl3YtmyzGyHEzOuh3jIPPnkHsyFFKf98QU= 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=wJ77WWQj9h6qheFpLz7oYOSuNmaQgtHdtKoKc+d31KI=; b=AJAYWRfjqR0hyIDYZObezJAY9IjXzYBOEAN4yOV2M9Oq3iVnyzsuLtqm4mOxIvesY1 fd1UuNGtxcu8KY1a78yii4BG4qtwnDwqI7QXQtmOqjWaMVl/Z6whUOmea0GMzLM0sFmW AnwokLV7EAe1tCLWI+OxDGlnRax9V+vL65gyHA/9YDb+gqDeuFAEJAfYckno/dOHULk7 oIMmnZ2chp8GyK4T0a4yc2lev4tiRDspICIKyzPq7H3goxAJyCWJ66mVEjYjEwCHbdCV MibJ4bQOvxbsiuBzxNXCE2exc/dEhqzFJ9f+qrArONd24Kll5+f0hHYyTbbAycA2SKj6 GOMw== X-Gm-Message-State: AMke39nuuGFaTFj3WiNVodpkepXReDrLPqlYPh4Jq8gvly6XzXd+xkme0MaFgzqzPriw/g== X-Received: by 10.25.56.72 with SMTP id d8mr4591799lfj.2.1489143045321; Fri, 10 Mar 2017 02:50:45 -0800 (PST) Received: from ozzy.hq.kempniu.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id r10sm500865ljd.54.2017.03.10.02.50.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Mar 2017 02:50:44 -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 v4 4/4] platform/x86: fujitsu-laptop: cleanup error labels in fujitsu_init() Date: Fri, 10 Mar 2017 11:50:36 +0100 Message-Id: <20170310105036.26899-5-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170310105036.26899-1-kernel@kempniu.pl> References: <20170310105036.26899-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 Error labels currently used in fujitsu_init() are really hard to follow: some (fail_laptop) indicate which operation has failed, others (fail_sysfs_group) indicate where unrolling should start and the rest (fail_platform_driver) is simply confusing. Change them to follow the pattern used throughout the rest of the module, i.e. make every label indicate the first unrolling operation it leads to. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index dad7b448f2cd..75d5f758af59 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -1244,60 +1244,60 @@ static int __init fujitsu_init(void) ret = acpi_bus_register_driver(&acpi_fujitsu_bl_driver); if (ret) - goto fail_acpi; + goto err_free_fujitsu_bl; /* Register platform stuff */ fujitsu_bl->pf_device = platform_device_alloc("fujitsu-laptop", -1); if (!fujitsu_bl->pf_device) { ret = -ENOMEM; - goto fail_platform_driver; + goto err_unregister_acpi; } ret = platform_device_add(fujitsu_bl->pf_device); if (ret) - goto fail_platform_device1; + goto err_put_platform_device; ret = sysfs_create_group(&fujitsu_bl->pf_device->dev.kobj, &fujitsu_pf_attribute_group); if (ret) - goto fail_platform_device2; + goto err_del_platform_device; ret = platform_driver_register(&fujitsu_pf_driver); if (ret) - goto fail_sysfs_group; + goto err_remove_sysfs_group; /* Register laptop driver */ fujitsu_laptop = kzalloc(sizeof(struct fujitsu_laptop), GFP_KERNEL); if (!fujitsu_laptop) { ret = -ENOMEM; - goto fail_laptop; + goto err_unregister_platform_driver; } ret = acpi_bus_register_driver(&acpi_fujitsu_laptop_driver); if (ret) - goto fail_laptop1; + goto err_free_fujitsu_laptop; pr_info("driver " FUJITSU_DRIVER_VERSION " successfully loaded\n"); return 0; -fail_laptop1: +err_free_fujitsu_laptop: kfree(fujitsu_laptop); -fail_laptop: +err_unregister_platform_driver: platform_driver_unregister(&fujitsu_pf_driver); -fail_sysfs_group: +err_remove_sysfs_group: sysfs_remove_group(&fujitsu_bl->pf_device->dev.kobj, &fujitsu_pf_attribute_group); -fail_platform_device2: +err_del_platform_device: platform_device_del(fujitsu_bl->pf_device); -fail_platform_device1: +err_put_platform_device: platform_device_put(fujitsu_bl->pf_device); -fail_platform_driver: +err_unregister_acpi: acpi_bus_unregister_driver(&acpi_fujitsu_bl_driver); -fail_acpi: +err_free_fujitsu_bl: kfree(fujitsu_bl); return ret;