From: SF Markus Elfring <elfring@users.sourceforge.net> To: kernel-janitors@vger.kernel.org, Alexandre Bounine <alexandre.bounine@idt.com>, Matt Porter <mporter@kernel.crashing.org> Cc: LKML <linux-kernel@vger.kernel.org> Subject: [PATCH 6/7] rapidio: Return an error code only as a constant in two functions Date: Fri, 15 Dec 2017 11:35:16 +0100 [thread overview] Message-ID: <8db441e1-c227-64e7-4747-095da63d7a2e@users.sourceforge.net> (raw) In-Reply-To: <f6e4d185-2c9d-a31d-793d-bda521c450ea@users.sourceforge.net> From: Markus Elfring <elfring@users.sourceforge.net> Date: Fri, 15 Dec 2017 10:40:19 +0100 * Return an error code without storing it in an intermediate variable. * Delete the label "out" and local variable "rc" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- drivers/rapidio/rio.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c index 4604410fb001..d095a18257c2 100644 --- a/drivers/rapidio/rio.c +++ b/drivers/rapidio/rio.c @@ -402,13 +402,10 @@ rio_setup_inb_dbell(struct rio_mport *mport, void *dev_id, struct resource *res, void (*dinb) (struct rio_mport * mport, void *dev_id, u16 src, u16 dst, u16 info)) { - int rc = 0; struct rio_dbell *dbell = kmalloc(sizeof(*dbell), GFP_KERNEL); - if (!dbell) { - rc = -ENOMEM; - goto out; - } + if (!dbell) + return -ENOMEM; dbell->res = res; dbell->dinb = dinb; @@ -417,9 +414,7 @@ rio_setup_inb_dbell(struct rio_mport *mport, void *dev_id, struct resource *res, mutex_lock(&mport->lock); list_add_tail(&dbell->node, &mport->dbells); mutex_unlock(&mport->lock); - - out: - return rc; + return 0; } /** @@ -563,21 +558,17 @@ int rio_add_mport_pw_handler(struct rio_mport *mport, void *context, int (*pwcback)(struct rio_mport *mport, void *context, union rio_pw_msg *msg, int step)) { - int rc = 0; struct rio_pwrite *pwrite = kzalloc(sizeof(*pwrite), GFP_KERNEL); - if (!pwrite) { - rc = -ENOMEM; - goto out; - } + if (!pwrite) + return -ENOMEM; pwrite->pwcback = pwcback; pwrite->context = context; mutex_lock(&mport->lock); list_add_tail(&pwrite->node, &mport->pwrites); mutex_unlock(&mport->lock); -out: - return rc; + return 0; } EXPORT_SYMBOL_GPL(rio_add_mport_pw_handler); -- 2.15.1
WARNING: multiple messages have this Message-ID (diff)
From: SF Markus Elfring <elfring@users.sourceforge.net> To: kernel-janitors@vger.kernel.org, Alexandre Bounine <alexandre.bounine@idt.com>, Matt Porter <mporter@kernel.crashing.org> Cc: LKML <linux-kernel@vger.kernel.org> Subject: [PATCH 6/7] rapidio: Return an error code only as a constant in two functions Date: Fri, 15 Dec 2017 10:35:16 +0000 [thread overview] Message-ID: <8db441e1-c227-64e7-4747-095da63d7a2e@users.sourceforge.net> (raw) In-Reply-To: <f6e4d185-2c9d-a31d-793d-bda521c450ea@users.sourceforge.net> From: Markus Elfring <elfring@users.sourceforge.net> Date: Fri, 15 Dec 2017 10:40:19 +0100 * Return an error code without storing it in an intermediate variable. * Delete the label "out" and local variable "rc" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- drivers/rapidio/rio.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c index 4604410fb001..d095a18257c2 100644 --- a/drivers/rapidio/rio.c +++ b/drivers/rapidio/rio.c @@ -402,13 +402,10 @@ rio_setup_inb_dbell(struct rio_mport *mport, void *dev_id, struct resource *res, void (*dinb) (struct rio_mport * mport, void *dev_id, u16 src, u16 dst, u16 info)) { - int rc = 0; struct rio_dbell *dbell = kmalloc(sizeof(*dbell), GFP_KERNEL); - if (!dbell) { - rc = -ENOMEM; - goto out; - } + if (!dbell) + return -ENOMEM; dbell->res = res; dbell->dinb = dinb; @@ -417,9 +414,7 @@ rio_setup_inb_dbell(struct rio_mport *mport, void *dev_id, struct resource *res, mutex_lock(&mport->lock); list_add_tail(&dbell->node, &mport->dbells); mutex_unlock(&mport->lock); - - out: - return rc; + return 0; } /** @@ -563,21 +558,17 @@ int rio_add_mport_pw_handler(struct rio_mport *mport, void *context, int (*pwcback)(struct rio_mport *mport, void *context, union rio_pw_msg *msg, int step)) { - int rc = 0; struct rio_pwrite *pwrite = kzalloc(sizeof(*pwrite), GFP_KERNEL); - if (!pwrite) { - rc = -ENOMEM; - goto out; - } + if (!pwrite) + return -ENOMEM; pwrite->pwcback = pwcback; pwrite->context = context; mutex_lock(&mport->lock); list_add_tail(&pwrite->node, &mport->pwrites); mutex_unlock(&mport->lock); -out: - return rc; + return 0; } EXPORT_SYMBOL_GPL(rio_add_mport_pw_handler); -- 2.15.1
next prev parent reply other threads:[~2017-12-15 10:35 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-12-15 10:26 [PATCH 0/7] RapidIO: Adjustments for some function implementations SF Markus Elfring 2017-12-15 10:26 ` SF Markus Elfring 2017-12-15 10:28 ` [PATCH 1/7] rapidio: Delete an error message for a failed memory allocation in rio_init_mports() SF Markus Elfring 2017-12-15 10:28 ` SF Markus Elfring 2017-12-15 10:30 ` [PATCH 2/7] rapidio: Adjust 12 checks for null pointers SF Markus Elfring 2017-12-15 10:30 ` SF Markus Elfring 2017-12-15 10:31 ` [PATCH 3/7] rapidio: Adjust five function calls together with a variable assignment SF Markus Elfring 2017-12-15 10:31 ` SF Markus Elfring 2017-12-15 10:32 ` [PATCH 4/7] rapidio: Improve a size determination in five functions SF Markus Elfring 2017-12-15 10:32 ` SF Markus Elfring 2017-12-15 10:34 ` [PATCH 5/7] rapidio: Delete an unnecessary variable initialisation in three functions SF Markus Elfring 2017-12-15 10:34 ` SF Markus Elfring 2017-12-15 10:35 ` SF Markus Elfring [this message] 2017-12-15 10:35 ` [PATCH 6/7] rapidio: Return an error code only as a constant in two functions SF Markus Elfring 2017-12-15 10:36 ` [PATCH 7/7] rapidio: Move 12 EXPORT_SYMBOL_GPL() calls to function implementations SF Markus Elfring 2017-12-15 10:36 ` SF Markus Elfring 2017-12-21 13:51 ` [PATCH 0/7] RapidIO: Adjustments for some " Bounine, Alexandre 2017-12-21 13:51 ` Bounine, Alexandre
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=8db441e1-c227-64e7-4747-095da63d7a2e@users.sourceforge.net \ --to=elfring@users.sourceforge.net \ --cc=alexandre.bounine@idt.com \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mporter@kernel.crashing.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.