From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935255AbcIRM5J (ORCPT ); Sun, 18 Sep 2016 08:57:09 -0400 Received: from mout.web.de ([212.227.17.11]:59768 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756682AbcIRM5A (ORCPT ); Sun, 18 Sep 2016 08:57:00 -0400 Subject: [PATCH 5/6] firmware-qemu_fw_cfg: Rename jump labels in fw_cfg_sysfs_probe() To: qemu-devel@nongnu.org, Gabriel Somlo , "Michael S. Tsirkin" References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Sun, 18 Sep 2016 14:56:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Mu+I+wGgirhjRVf8UKLHyx1L7U0U9iVy+SBnGzuM/vTEBQbfkJk 7wkSaxB7zyg513B0suV3inQdtLF6Vo4EG9wbaY0CHLFEER3+DxBcT+u1XDrV+iTOuRNniOo ocbVQ53Dvyx2msAfpnsOc6b9rIxRBDFpeiJ+3Cct3Osgw5py1IGPCsXjxfcJatE0O02OQy8 wC9X7KbYGumWThP0aJzkg== X-UI-Out-Filterresults: notjunk:1;V01:K0:TCQGIqkcD9E=:YXAg93Hzqi8C//lKv9Jepl SPZWTleLehsoetAhG5nKaTjxsEJAESCumoqBDr1nmD3YFqjQkoAzab6hEC8MdPJwug+UruQf4 D9D0UQMryJDwv7eq7DR6CRIwHwCSAi5Iy0Fb8QuWVMSEIrvi1c9nM0HdvVB6wi3BkUMcvg35+ 7x1C5S/NxefsctTgE6VW/7sz+I0DY1wLtfSNcCjGHqycMQ8mBkWBYMDI0EGk0wdlkw40MQE9p JpegQzOeD0n/1Ut8DP+a03vVQv7HGKy+tVG64iCKVcJN0HYyOI07plS2C6LVSepBwkPOLwgEb 0NuNtvIxXe68SdmdULkC98KeTV0HpeMNOPsud11KcV3YCePrccyigyXV5e9kpzYk7M8KHWldM t9ZQzKvoseqAlZoI98XbTBnINSR5w9m1G0OR7BLrOEIVcJbe0BbL+SycDqGuvQVIW2f+6igoL zs3/Loa0E2GvWAGLIJ6vbL3TQv5DNGCh4QqgFQwAj3vYbuNuVQ6whjOz6z8koPLRlThD2M5jX qX/cluRPmRTxOFAYT8fMLGr1/RYCEC1OlR/HmFJL2wXlyqCb6SNtpSdfQmA57r0726d9Xnqjr mhD1I6mHkBahp3SBS431QOCNnVowj3Mfb6L2ZbUhLpZoY3/XvKlrdastD6yUziGIrVouWaKVJ lAYNC3LKtm7CIhfKM95DZ3/Ef4Z/x3TMfXDpvo/QH8syhTixw2eE+jlf50rWYNfA5YiQVY3pk UPMyvDd+RmBGfKGwZK6+vpNLHD8l015lhp53OoIHjde51WuTkC7pwL6LSo+mqbpyJFiKZcfey BiVZTa4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 18 Sep 2016 14:04:48 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/firmware/qemu_fw_cfg.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index a4b108a..a09e59c 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c @@ -538,42 +538,41 @@ static int fw_cfg_sysfs_probe(struct platform_device *pdev) err = -ENOMEM; fw_cfg_sel_ko = kobject_create_and_add("by_key", fw_cfg_top_ko); if (!fw_cfg_sel_ko) - goto err_sel; + goto exit; fw_cfg_fname_kset = kset_create_and_add("by_name", NULL, fw_cfg_top_ko); if (!fw_cfg_fname_kset) - goto err_name; + goto cleanup_object; /* initialize fw_cfg device i/o from platform data */ err = fw_cfg_do_platform_probe(pdev); if (err) - goto err_probe; + goto unregister; /* get revision number, add matching top-level attribute */ fw_cfg_read_blob(FW_CFG_ID, &fw_cfg_rev, 0, sizeof(fw_cfg_rev)); fw_cfg_rev = le32_to_cpu(fw_cfg_rev); err = sysfs_create_file(fw_cfg_top_ko, &fw_cfg_rev_attr.attr); if (err) - goto err_rev; + goto cleanup_io; /* process fw_cfg file directory entry, registering each file */ err = fw_cfg_register_dir_entries(); if (err) - goto err_dir; + goto cleanup_cache; /* success */ pr_debug("fw_cfg: loaded.\n"); return 0; - -err_dir: + cleanup_cache: fw_cfg_sysfs_cache_cleanup(); sysfs_remove_file(fw_cfg_top_ko, &fw_cfg_rev_attr.attr); -err_rev: + cleanup_io: fw_cfg_io_cleanup(); -err_probe: + unregister: fw_cfg_kset_unregister_recursive(fw_cfg_fname_kset); -err_name: + cleanup_object: fw_cfg_kobj_cleanup(fw_cfg_sel_ko); -err_sel: + exit: return err; } -- 2.10.0