From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933589AbcIRMyN (ORCPT ); Sun, 18 Sep 2016 08:54:13 -0400 Received: from mout.web.de ([217.72.192.78]:63191 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932700AbcIRMyF (ORCPT ); Sun, 18 Sep 2016 08:54:05 -0400 Subject: [PATCH 3/6] firmware-qemu_fw_cfg: Rename jump labels in fw_cfg_register_file() 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: <4c5acd9d-542b-e0e1-ebe3-3e7752019944@users.sourceforge.net> Date: Sun, 18 Sep 2016 14:53:53 +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:AL6s3EM7FvqWIY+g0/htYilw+pOEE6IZ3o0c1K4esUU5lqd1R0p Z9ABYm6Qa3vx/sYBNzDEB9TVU19eyMkXzJ4I0hdX7BQP/shs0WItv4xL9wF3KoXCpotBx4c q9plZ69MWbk9LP1ZvOrNpbbjE3/sL0zBVG+JlxtUsbfoA9obJoAuQGdXH2gr0i453dBN/E0 PIrlgIYAmMzPgSy3z5NIg== X-UI-Out-Filterresults: notjunk:1;V01:K0:8vm2TbVV8j0=:lhSI+v0Pe6nBU1YQmq3Tnc 7jFAxxnY+fwuRfIPNF3zsvHTMsbQ4nJuFxE3bNQ/R4Wrqdn595xjt4SC2DFcEDJCaagxQvrlJ 8dOjjrp9ACe6VBplLB/akk5bPsS3eZvHYwevPK5eeKdJjynjSYNdtKy6vScLnpva9XhgQuPnV J6JNSvVh5VGGcPVo6BK6vl+HdMqZAgJlr96tZuAn3MHt55Y0U2gFjhoJFMdVbf0tJRPp/Y58Y fQveGlRtPo0gdAscuxIfuN9SnPm9YgD+kmVZGhctZav8PJvUOCkSjhq2JUhNwZoqY2otGnHVV x2FzuhgkKAetZ7gp0AMYDxkGYsrFxjpcnhpirCwbBH8itA4ej9gB1tF8BENk1E6Qto1wOrTEH 9z1jJKLISV4vHwreIZNkv1rRHfChi7eGCgIcYujlM5c66d133V1WnpM0C38xc3MPrawQ0P03b PUh24qmEUAqvOR+bGOPaaOMeglpfaQ4Sd+EzTJ6anHsqa5caSgrcixQ02yLSFBGo2Jb3/Y1F3 qGApdmgSkXQwLK3alC3QQEOJyc4tidRWCjgmLBy40/CdbSdm8ranIac1Z+yd1Q8cmleEm9+1J gUAfjbIwehEP71v0Y9r4OM9WqFsk1b8nhtVq8sOX2uvOUPapxyqiNWYRrLiZIzoKxkVb5pbxK SUFC0N1HrzPOk5Nh7KGnrvdPwCz1zEwXv4aahDiMZbPi89e9g2xrB7adpTrwpz8ZyqBzEs9LN 4jt/oa1/hCNR/1DVN+3+d1wPYlalLn3TDQwN7gJiMoJzUKiunenfFaA9YrYMSWOiJRVaZNwte CwJ+WFl 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 11:23:46 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/firmware/qemu_fw_cfg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index a229df6..a834d01 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c @@ -464,12 +464,12 @@ static int fw_cfg_register_file(const struct fw_cfg_file *f) err = kobject_init_and_add(&entry->kobj, &fw_cfg_sysfs_entry_ktype, fw_cfg_sel_ko, "%d", entry->f.select); if (err) - goto err_register; + goto free_entry; /* add raw binary content access */ err = sysfs_create_bin_file(&entry->kobj, &fw_cfg_sysfs_attr_raw); if (err) - goto err_add_raw; + goto delete_object; /* try adding "/sys/firmware/qemu_fw_cfg/by_name/" symlink */ fw_cfg_build_symlink(fw_cfg_fname_kset, &entry->kobj, entry->f.name); @@ -477,10 +477,9 @@ static int fw_cfg_register_file(const struct fw_cfg_file *f) /* success, add entry to global cache */ fw_cfg_sysfs_cache_enlist(entry); return 0; - -err_add_raw: + delete_object: kobject_del(&entry->kobj); -err_register: + free_entry: kfree(entry); return err; } -- 2.10.0