From patchwork Fri Jan 13 11:02:40 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: 9515223 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 02AF4601DA for ; Fri, 13 Jan 2017 11:04:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB26D284B9 for ; Fri, 13 Jan 2017 11:04:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDC4728601; Fri, 13 Jan 2017 11:04:17 +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 6910E284B9 for ; Fri, 13 Jan 2017 11:04:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751588AbdAMLED (ORCPT ); Fri, 13 Jan 2017 06:04:03 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:33904 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751523AbdAMLCs (ORCPT ); Fri, 13 Jan 2017 06:02:48 -0500 Received: by mail-lf0-f67.google.com with SMTP id q89so5188346lfi.1 for ; Fri, 13 Jan 2017 03:02:47 -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=eH5o++DIbCc83+A+NNDkKdnMP5akT922DSU9+OsBLwU=; b=aQ6F7GpwE8WX7AKG6MNvRNmfBTle7JEcvqkkE2wc6pWtI8CZodCD2ZvtF498kGzl2T k8GjA47pygaxNDnfC1WnA2M802b02HyMAycsS5QPjl60hkiNktyqBQwTH9fWCCq71Z8j DNWp3SCGVNw7lydmcc6pVIpl1hASftImAb/2I= 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=eH5o++DIbCc83+A+NNDkKdnMP5akT922DSU9+OsBLwU=; b=XUyz55xd0i1dQkKLpSuxbpkL8+HzwrkXUvYT2xTWn9NafM5vGaWriJQvYCsAp16uTd +8ohlB1lKLES+/mmdN3xZlWGREucchW7+AYAU8BIsk+4pfLyxveOO4SPbYUKg+smDCRZ K8dqOrUpYqm05JqJMt2aNQfd5VfZlhX8Qc2MOOD8JopGlXZRKF4ulQjRoDAFQRPYkJWa 1dhCbL82b3xNZ9XdDl391VDzJnl5ScS7W2ST/q/YvBGGqCrDWH8etR6oM7vJzePvwIED zhH302RkeQaQNI2o0iZP6dIsuW4h0nPSZ+OrhmI5ghNysE/iuU/+gpSX8ZRMohgRkV+g EUMA== X-Gm-Message-State: AIkVDXJuNcCwrcmc4R5Dbmc1BSEmsa8mYZ1wDqIE+B0Pc1/UVqwFt93PZBSOq8oTRIFG+w== X-Received: by 10.25.156.213 with SMTP id f204mr6851232lfe.27.1484305366898; Fri, 13 Jan 2017 03:02:46 -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.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jan 2017 03:02:46 -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 4/4] platform/x86: fujitsu-laptop: cleanup error labels in fujitsu_init() Date: Fri, 13 Jan 2017 12:02:40 +0100 Message-Id: <20170113110240.622-5-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 Error labels currently used in fujitsu_init() are really hard to follow: some (fail_hotkey) 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 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 6438bcce90d4..67bb14ed3723 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -1220,70 +1220,70 @@ static int __init fujitsu_init(void) ret = acpi_bus_register_driver(&acpi_fujitsu_driver); if (ret) - goto fail_acpi; + goto err_free_fujitsu; /* Register platform stuff */ fujitsu->pf_device = platform_device_alloc("fujitsu-laptop", -1); if (!fujitsu->pf_device) { ret = -ENOMEM; - goto fail_platform_driver; + goto err_unregister_acpi; } ret = platform_device_add(fujitsu->pf_device); if (ret) - goto fail_platform_device1; + goto err_put_platform_device; ret = sysfs_create_group(&fujitsu->pf_device->dev.kobj, &fujitsupf_attribute_group); if (ret) - goto fail_platform_device2; + goto err_del_platform_device; /* Register backlight stuff */ if (acpi_video_get_backlight_type() == acpi_backlight_vendor) { ret = fujitsu_backlight_init(); if (ret) - goto fail_sysfs_group; + goto err_remove_sysfs_group; } ret = platform_driver_register(&fujitsupf_driver); if (ret) - goto fail_backlight; + goto err_unregister_backlight; /* Register hotkey driver */ fujitsu_hotkey = kzalloc(sizeof(struct fujitsu_hotkey_t), GFP_KERNEL); if (!fujitsu_hotkey) { ret = -ENOMEM; - goto fail_hotkey; + goto err_unregister_platform_driver; } ret = acpi_bus_register_driver(&acpi_fujitsu_hotkey_driver); if (ret) - goto fail_hotkey1; + goto err_free_fujitsu_hotkey; pr_info("driver " FUJITSU_DRIVER_VERSION " successfully loaded\n"); return 0; -fail_hotkey1: +err_free_fujitsu_hotkey: kfree(fujitsu_hotkey); -fail_hotkey: +err_unregister_platform_driver: platform_driver_unregister(&fujitsupf_driver); -fail_backlight: +err_unregister_backlight: backlight_device_unregister(fujitsu->bl_device); -fail_sysfs_group: +err_remove_sysfs_group: sysfs_remove_group(&fujitsu->pf_device->dev.kobj, &fujitsupf_attribute_group); -fail_platform_device2: +err_del_platform_device: platform_device_del(fujitsu->pf_device); -fail_platform_device1: +err_put_platform_device: platform_device_put(fujitsu->pf_device); -fail_platform_driver: +err_unregister_acpi: acpi_bus_unregister_driver(&acpi_fujitsu_driver); -fail_acpi: +err_free_fujitsu: kfree(fujitsu); return ret;