Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1485787
| Path | csiph.com!1.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!news.in-chemnitz.de!news2.arglkargh.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 3/6] firmware-qemu_fw_cfg: Rename jump labels in fw_cfg_register_file() |
| Date | Sun, 18 Sep 2016 15:00:01 +0200 |
| Message-ID | <siJRn-8eJ-3@gated-at.bofh.it> (permalink) |
| References | <qEuGl-43C-5@gated-at.bofh.it> <siJHH-8bB-9@gated-at.bofh.it> |
| X-Original-To | qemu-devel@nongnu.org, Gabriel Somlo <somlo@cmu.edu>, "Michael S. Tsirkin" <mst@redhat.com> |
| User-Agent | Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 |
| MIME-Version | 1.0 |
| 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 | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 44 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org, Julia Lawall <julia.lawall@lip6.fr> |
| X-Original-Date | Sun, 18 Sep 2016 14:53:53 +0200 |
| X-Original-Message-ID | <4c5acd9d-542b-e0e1-ebe3-3e7752019944@users.sourceforge.net> |
| X-Original-References | <566ABCD9.1060404@users.sourceforge.net> <a736b350-a691-c73b-b8e9-67c0bffb716a@users.sourceforge.net> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1485787 |
Show key headers only | View raw
From: Markus Elfring <elfring@users.sourceforge.net> 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 <elfring@users.sourceforge.net> --- 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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/6] firmware-qemu_fw_cfg: Fine-tuning for four function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 14:50 +0200 [PATCH 3/6] firmware-qemu_fw_cfg: Rename jump labels in fw_cfg_register_file() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200 [PATCH 6/6] firmware-qemu_fw_cfg: Move a variable assignment in fw_cfg_sysfs_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200 [PATCH 1/6] firmware-qemu_fw_cfg: Use kmalloc_array() in fw_cfg_register_dir_entries() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200 [PATCH 2/6] firmware-qemu_fw_cfg: Improve a size determination in fw_cfg_register_file() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200 [PATCH 4/6] firmware-qemu_fw_cfg: Improve a size determination in fw_cfg_build_symlink() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200 [PATCH 5/6] firmware-qemu_fw_cfg: Rename jump labels in fw_cfg_sysfs_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200 Re: [PATCH 0/6] firmware-qemu_fw_cfg: Fine-tuning for four function implementations "Gabriel L. Somlo" <somlo@cmu.edu> - 2016-09-20 13:40 +0200
csiph-web